fml
address kleinsch's comments
Merge pull request #319 from balanced/login-hack

FML