Fix up change password