Spent time fix
Login fix