Merge "Fix handling of user password changes."