Further login usability stuff. I'm definitely off to bed this time I
swear!