diff --git a/app/controllers/user_confirmations_controller.rb b/app/controllers/user_confirmations_controller.rb
index f4d1ef3925..0915447bc5 100644
--- a/app/controllers/user_confirmations_controller.rb
+++ b/app/controllers/user_confirmations_controller.rb
@@ -44,7 +44,7 @@ class UserConfirmationsController < DeviseController
         'not_confirmed'
       end
 
-    if resource.reset_password_token.present?
+    if result == 'confirmed' && resource.reset_password_token.present?
       raw_reset_password_token = resource.regenerate_reset_password_token
       return spree.edit_spree_user_password_path(
         reset_password_token: raw_reset_password_token