fixed login issue and done apply button services