more fixes to login