Revert "Fixed login"

This reverts commit c6d43f113cfab93c27bdb21244b9713aa26a6f49.
Revert "Revert "Fixed login""

This reverts commit 01b8d42fb20f790bf0ed013a4624da622f84682a.