actually fixed password reminder
Merge branch 'master' into usernamereminder