diff --git a/app/assets/stylesheets/overrides.sass b/app/assets/stylesheets/overrides.sass
index 86ee57b85..061c56335 100644
--- a/app/assets/stylesheets/overrides.sass
+++ b/app/assets/stylesheets/overrides.sass
@@ -346,9 +346,9 @@ ul.thumbnail-buttons
   .navbar .navbar-form
     width: 250px
 
-.login-page
+.form-page
   text-align: center
-  .login-card
+  .form-card
     max-width: 500px
     text-align: center
     display: inline-block
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index 95ea33ff5..fe8df5ba0 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -1,19 +1,16 @@
-- content_for :title, "Forgot your password?"
 
-= form_for(resource, as: resource_name,
-    url: password_path(resource_name),
-    html: { method: :post,
-    class: 'form-horizontal', role: 'form' }) do |f|
-  = devise_error_messages!
+.form-page
+  %section.card.form-card
+    %h2 Forgot your password?
+    = form_for(resource, as: resource_name,
+        url: password_path(resource_name),
+        html: { method: :post,
+        class: 'text-center border border-light p-5', role: 'form' }) do |f|
+      = devise_error_messages!
 
-  .form-group
-    = f.label :login, class: 'control-label col-md-2'
-    .col-md-8
-      = f.text_field :login, class: 'form-control'
-  .form-group
-    .form-actions.col-md-offset-2.col-md-8
+      = f.text_field :login, class: "form-control mb-4", placeholder: "E-mail", type: "email"
       = f.submit "Send me reset password instructions", class: 'btn btn-primary'
 
-  .form-group
-    .col-md-offset-2.col-md-8
-      = render "devise/shared/links"
+      .form-group
+        .col-md-offset-2.col-md-8
+          = render "devise/shared/links"
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 8be829730..cb3764270 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,6 +1,6 @@
 
-.login-page
-  %section.card.login-card
+.form-page
+  %section.card.form-card
     %h1 Sign in
     = form_for(resource, as: resource_name,
         url: session_path(resource_name),