Restored unwanted modification

Restored unwanted modification of login functionality introduced in
commit 8532677.