Clean up tests for forgot and reset password, fix bug with resetting passwords
Merge pull request #500 from kleinsch/fix-forgot-password

Fix reset password bug