diff --git a/app/controllers/spree/users_controller.rb b/app/controllers/spree/users_controller.rb
index cf87ba49da..49900a9a46 100644
--- a/app/controllers/spree/users_controller.rb
+++ b/app/controllers/spree/users_controller.rb
@@ -62,8 +62,7 @@ module Spree
         if params[:user][:password].present?
           # this logic needed b/c devise wants to log us out after password changes
           Spree::User.reset_password_by_token(params[:user])
-          sign_in(@user, event: :authentication,
-                         bypass: true)
+          bypass_sign_in(@user)
         end
         redirect_to spree.account_url, notice: Spree.t(:account_updated)
       else