More fixes to login.