diff --git a/app/assets/javascripts/app/controllers/reset_password.js.coffee b/app/assets/javascripts/app/controllers/reset_password.js.coffee
index da47e2206..5b149fd56 100644
--- a/app/assets/javascripts/app/controllers/reset_password.js.coffee
+++ b/app/assets/javascripts/app/controllers/reset_password.js.coffee
@@ -1,5 +1,5 @@
 class Index extends App.ControllerContent
-  className: 'container'
+  className: 'reset_password fit'
 
   events:
     'submit form':   'submit'
diff --git a/app/assets/javascripts/app/views/password/reset.jst.eco b/app/assets/javascripts/app/views/password/reset.jst.eco
index 100d61e70..5650ba5e6 100644
--- a/app/assets/javascripts/app/views/password/reset.jst.eco
+++ b/app/assets/javascripts/app/views/password/reset.jst.eco
@@ -1,14 +1,18 @@
-<div class="hero-unit">
-  <% if @sent: %>
-    <h2><%- @T('We\'ve sent password reset instructions to your email address.') %><small></small></h2>
-    <p><%- @T('If you don\'t receive instructions within a minute or two, check your email\'s spam and junk filters, or try resending your request.') %></p>
-    <a href="#" class="retry">&raquo; <%- @T('again') %> &laquo;</a>
-  <% end %>
-  <div id="form-password">
-    <h2><%- @T( 'Forgot your password?' ) %><small></small></h2>
-    <form id="form-password-item" class="form-normal">
-      <a href="#/" class="btn btn-default cancel"><%- @T( 'Cancel' ) %></a>
-      <button class="btn btn-primary submit"><%- @T( 'Submit' ) %></button>
-    </form>
+<div class="fullHeight vertical center justified">
+  <div class="hero-unit">
+    <% if @sent: %>
+      <h2><%- @T('We\'ve sent password reset instructions to your email address.') %><small></small></h2>
+      <p><%- @T('If you don\'t receive instructions within a minute or two, check your email\'s spam and junk filters, or try resending your request.') %></p>
+      <a href="#" class="subtle retry">&raquo; <%- @T('again') %> &laquo;</a>
+    <% end %>
+    <div id="form-password">
+      <h2><%- @T( 'Forgot your password?' ) %><small></small></h2>
+      <form id="form-password-item">
+        <div class="form-controls">
+          <a class="subtle-link standalone pull-left cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
+          <button class="btn btn-primary submit pull-right"><%- @T( 'Submit' ) %></button>
+        </div>
+      </form>
+    </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/app/views/password/reset_change.jst.eco b/app/assets/javascripts/app/views/password/reset_change.jst.eco
index d16f2c4d8..f10f7a026 100644
--- a/app/assets/javascripts/app/views/password/reset_change.jst.eco
+++ b/app/assets/javascripts/app/views/password/reset_change.jst.eco
@@ -1,7 +1,8 @@
-<div class="hero-unit">
-  <h2><%- @T( 'Choose your new password.' ) %><small></small></h2>
-  <form class="form-normal">
-    <p id="form-password-change"></p>
-    <button class="btn btn-primary submit"><%- @T( 'Submit' ) %></button>
-  </form>
+<div class="fullHeight vertical center justified">
+  <div class="hero-unit">
+    <h2><%- @T( 'Choose your new password.' ) %><small></small></h2>
+    <form id="form-password-change">
+      <button class="btn btn-primary submit"><%- @T( 'Submit' ) %></button>
+    </form>
+  </div>
 </div>
diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css
index cea7ea5ae..202212f01 100644
--- a/app/assets/stylesheets/zzz.css
+++ b/app/assets/stylesheets/zzz.css
@@ -395,6 +395,7 @@ h1 {
 }
 h2 {
   font-size: 19px;
+  line-height: 25px;
   color: rgba(0,8,14,.73);
 }
 h3 {
@@ -444,7 +445,6 @@ label {
 
   .help-inline {
     color: red;
-    padding: 0 2px;
     font-size: 13px;
   }
 
@@ -590,7 +590,8 @@ label {
     0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
 
-  .hero-unit h1 {
+  .hero-unit h1,
+  .hero-unit h2 {
     margin-top: 0;
   }