Fixed null pointer on login repost.
Merge remote-tracking branch 'origin/master'