Fix bug where admin could not change password for user without email listed.
Merge branch 'bugfix-password' into develop