Fix first time user login.
Merge commit 'd7651d5f5d172155478def49849b3c72238b9894'

* commit 'd7651d5f5d172155478def49849b3c72238b9894':
  fixed user login