Prevent fatal error on password reset. Fixes #2255
Merge pull request #2256 from michael-e/fix-password-reset

Prevent fatal error on password reset. Fixes #2255