This should fix the issues in #4
Merge branch 'hotfix/v0.1.3-forgot-my-password'
v0.1.3-forgot-my-password fixes #4