Some more login refinements