This fixes #82
Merge pull request #86 from thehelpsf/bugfix/first-time-login

This fixes #82