Fix handling of user password changes.
am: 3c04bca28a

Change-Id: Ifb21007b5767a764a807739f50b119cbff7772a8