Fix for password reset
Merge pull request #342 from nephila/feature/fix_password_reset

Fix for password reset for `without_usernames`