Revert "Login changes on latest code"

This reverts commit 4c1592062f4c296bb4ef20a173deae8fd4c23ca6.
Revert "Login changes"

This reverts commit 2351d1f490ea375125ec709c66b2feb768214acd.