[#53653247] properly update user with new reset_password_token on password reset
email request, and make sure that the email includes the new
reset_password_token, not the previous one