Fix errors changing passwords.

Change-Id: I5e79a19f3cff5e960ebcdb94c08469e6c8d2bb99