Fixed for new password thing

Change-Id: I96248cfe0ded4513fecbec73df128635cc61e8b6