Ensure password is set correctly on existing users

While reviewing this code it became obvious that password changes would
not be honored for existing users. This ensures that any user that
exists has their password set if one is passed in.

Change-Id: I356a0ef833041d31029e127415be1719cc1c4348
Merge "Ensure password is set correctly on existing users"