Test password reset and fix bug
Merge pull request #299 from theodi/fix-password-reset

Test password reset and fix bug