Fix login

Creating pull request for discussion