diff --git a/app/controllers/user_confirmations_controller.rb b/app/controllers/user_confirmations_controller.rb
index d8b6b221fe..c3caf49157 100644
--- a/app/controllers/user_confirmations_controller.rb
+++ b/app/controllers/user_confirmations_controller.rb
@@ -3,7 +3,6 @@
 class UserConfirmationsController < DeviseController
   # Needed for access to current_ability, so we can authorize! actions
   include Spree::Core::ControllerHelpers::Auth
-  include CablecarResponses
 
   # GET /resource/confirmation?confirmation_token=abcdef
   def show
@@ -29,11 +28,8 @@ class UserConfirmationsController < DeviseController
         set_flash_message(:error, :confirmation_not_sent)
       end
     else
-      render cable_ready: cable_car.inner_html(
-        "##{params[:tab] || 'forgot'}-feedback",
-        partial("layouts/alert",
-                locals: { type: "success", message: t("devise.confirmations.send_instructions") })
-      )
+      flash.now[:sucess] = t("devise.confirmations.send_instructions")
+      render 'spree/user_confirmations/create'
       return
     end
 
diff --git a/app/views/spree/user_confirmations/create.turbo_stream.haml b/app/views/spree/user_confirmations/create.turbo_stream.haml
new file mode 100644
index 0000000000..9c40b050c5
--- /dev/null
+++ b/app/views/spree/user_confirmations/create.turbo_stream.haml
@@ -0,0 +1,2 @@
+= turbo_stream.update "#{params[:tab] || 'forgot'}-feedback" do   
+  = render partial: 'shared/flashes', locals: { flashes: flash }
diff --git a/app/webpacker/controllers/login_modal_controller.js b/app/webpacker/controllers/login_modal_controller.js
index 7fc2111ab1..52530b2ec4 100644
--- a/app/webpacker/controllers/login_modal_controller.js
+++ b/app/webpacker/controllers/login_modal_controller.js
@@ -75,8 +75,8 @@ export default class extends Controller {
       }),
       headers: { "Content-type": "application/json; charset=UTF-8" },
     })
-      .then((data) => data.json())
-      .then(CableReady.perform);
+    .then(response => response.text())
+    .then(html => {console.log(html); Turbo.renderStreamMessage(html)});
   }
 
   returnHome() {