diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index a4073d259..cf69b955d 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -17,9 +17,6 @@
     <%= javascript_pack_tag 'application', defer: true %>
     <%= capybara_lockstep if defined?(Capybara::Lockstep) %>
 
-    <p class="notice"><%= notice %></p>
-    <p class="alert"><%= alert %></p>
-
     <% if Rails.env.development? %>
       <script>
         console.log(<%= session.to_json.html_safe %>)
@@ -29,6 +26,7 @@
 
   <body class="govuk-template__body ">
 
+
     <script>
       document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
     </script>
@@ -43,7 +41,6 @@
           )
       %>
     </header>
-
     <aside class="govuk-width-container">
       <%= render GovukComponent::PhaseBannerComponent.new(
         tag: { text: 'Beta' },
@@ -57,6 +54,15 @@
       </div>
 
       <main class="govuk-main-wrapper " id="main-content" role="main">
+        <% flash.each do |type, msg| %>
+          <%= render GovukComponent::NotificationBannerComponent.new(
+            title_text: 'Success',
+            success: true, title_heading_level: 3,
+            title_id: "swanky-notifications") do |notification_banner|
+              notification_banner.heading(text: msg)
+            end
+          %>
+        <% end %>
         <%= yield %>
       </main>
     </div>
diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb
index c9e8a17b4..9ea79708c 100644
--- a/spec/features/user_spec.rb
+++ b/spec/features/user_spec.rb
@@ -49,5 +49,12 @@ RSpec.describe "User Features" do
       fill_in("user_email", with: user.email)
       expect { click_button("Send email") }.to change { ActionMailer::Base.deliveries.count }.by(1)
     end
+
+    it " is shown the password reset confirmation page and successful flash message shows" do
+      visit("/users/password/new")
+      fill_in("user_email", with: user.email)
+      click_button("Send email")
+      expect(page).to have_css '.govuk-notification-banner.govuk-notification-banner--success'
+    end    
   end
 end
