Make password reset form work...
Merge branch 'hotfix/make-password-reset-form-work'