made some changes to login
Merge branch 'login_flow' into develop

* login_flow:
  made some changes to login