diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb
index 92d64f00466..0705a506d1c 100644
--- a/app/controllers/spree/user_sessions_controller.rb
+++ b/app/controllers/spree/user_sessions_controller.rb
@@ -23,7 +23,7 @@ def create
       if spree_user_signed_in?
         flash[:success] = t('devise.success.logged_in_succesfully')
 
-        redirect_to after_sign_in_path_for(spree_current_user)
+        redirect_to return_url_or_default(after_sign_in_path_for(spree_current_user))
       else
         @message = t('devise.failure.invalid')
         render :create, status: :unauthorized
diff --git a/app/views/layouts/_alert.html.haml b/app/views/layouts/_alert.html.haml
index be1bc76ba9f..c77aeb80f10 100644
--- a/app/views/layouts/_alert.html.haml
+++ b/app/views/layouts/_alert.html.haml
@@ -1,6 +1,5 @@
 .alert-box{ class: "#{type}" }
   = message
   - if local_assigns[:unconfirmed]
-    - params = { spree_user: { email: email }, tab: local_assigns[:tab] }
-    = link_to spree_user_confirmation_path(params), params:, data: { turbo_method: :post } do
+    = link_to spree_user_confirmation_path(spree_user: { email: }, tab: local_assigns[:tab]), data: { turbo_method: :post } do
       = t('devise.confirmations.resend_confirmation_email')