Fix password reset issues.

Change-Id: I89a633be2b7c37c21a1c257615d77fc84cbe8b34