removed reference to new_password and new_password_again as special fields