corrected the add/edit user logic to make sure the password is only updated when we expect
Merge branch 'hotfix/password-unset'