diff --git a/password_reset_form.html b/password_reset_form.html
index 0e22c6e02a..5c5aaf7853 100755
--- a/password_reset_form.html
+++ b/password_reset_form.html
@@ -3,6 +3,7 @@
 <p>Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one.</p>
 
 <form action="/password_reset/" method="post">
-<input type='hidden' name='csrfmiddlewaretoken' value='${ csrf }' />
-<p><label for="id_email">E-mail address:</label> <input id="id_email" type="text" name="email" maxlength="75" /> <input type="button" id="pwd_reset_button" value="Reset my password" /></p>
+  <input type='hidden' name='csrfmiddlewaretoken' value='${ csrf }' />
+  <label for="id_email">E-mail address:</label>
+  <input id="id_email" type="email" name="email" maxlength="75" /> <input type="button" id="pwd_reset_button" value="Reset my password" />
 </form>
diff --git a/sass/_fancybox.scss b/sass/_fancybox.scss
index dc989de7e0..8a9b717ce4 100644
--- a/sass/_fancybox.scss
+++ b/sass/_fancybox.scss
@@ -27,7 +27,6 @@ div#fancybox-wrap {
       h1 {
         font-size: 24px;
         margin-top: 0;
-        font-family: "Oswald";
         padding-bottom: lh();
         border-bottom: 1px solid #eee;
         margin-bottom: lh();
@@ -44,20 +43,25 @@ div#fancybox-wrap {
           font-weight: bold;
         }
 
+        label {
+          display: block;
+          font-weight: bold;
+        }
+
+        #{$all-text-inputs} {
+          width: 100%;
+          @include box-sizing(border-box);
+        }
+
+        input[type="checkbox"] {
+          margin-right: 10px;
+        }
+
         ol {
           li {
             margin-bottom: lh();
-            width: grid-width(6);
-            float: left;
-
-            &:nth-child(odd) {
-              margin-right: $gw-gutter;
-            }
 
             &.terms, &.remember {
-              float: none;
-              width: auto;
-              clear: both;
               padding-top: lh();
               border-top: 1px solid #eee;
             }
@@ -67,10 +71,6 @@ div#fancybox-wrap {
               float: none;
             }
 
-            label {
-              display: block;
-              font-weight: bold;
-            }
 
             ul {
               list-style: disc outside none;
@@ -84,15 +84,6 @@ div#fancybox-wrap {
                 float: none;
               }
             }
-
-            #{$all-text-inputs} {
-              width: 100%;
-              @include box-sizing(border-box);
-            }
-
-            input[type="checkbox"] {
-              margin-right: 10px;
-            }
           }
         }
 
@@ -121,11 +112,22 @@ div#fancybox-wrap {
 
         a {
           color: #999;
+
           &:hover {
             color: #444;
           }
         }
       }
+
+      div#pwd_reset {
+        p {
+          margin-bottom: lh();
+        }
+
+        input[type="email"] {
+          margin-bottom: lh();
+        }
+      }
     }
   }
 }