more fixes and polish around login