Merge fix for admin changing user password; Resolves #555