diff --git a/browserid/static/dialog/css/m.css b/browserid/static/dialog/css/m.css
index 9ddb605ea69a40de8225cbc81420ceecf12ddcb4..0def4febe1c044d046e752609261ec403a636337 100644
--- a/browserid/static/dialog/css/m.css
+++ b/browserid/static/dialog/css/m.css
@@ -102,7 +102,7 @@
     font-size: 14px;
   }
 
-  #content, .pickemail .form_section, .pickemail .inputs, .vertical {
+  #content, .form_section, .pickemail .inputs, .vertical {
     height: auto;
     overflow: visible;
   }
diff --git a/browserid/static/dialog/css/popup.css b/browserid/static/dialog/css/popup.css
index 46f393cec6d0378e7db9cfea155436474717b8e8..fb43054b98e7ff5cbcac496726a0ffd0f5378cc1 100644
--- a/browserid/static/dialog/css/popup.css
+++ b/browserid/static/dialog/css/popup.css
@@ -564,7 +564,7 @@ html[xmlns] .cf {
     overflow-y: auto;
 }
 
-.pickemail .form_section {
+.form_section {
     height: 176px;
 }
 
diff --git a/browserid/static/dialog/views/authenticate.ejs b/browserid/static/dialog/views/authenticate.ejs
index 3341bac640d68f72ff23d609be20cdc9eb3e736f..ae0c180a6e5837c3111364ea6d1ca9d2947f8c08 100644
--- a/browserid/static/dialog/views/authenticate.ejs
+++ b/browserid/static/dialog/views/authenticate.ejs
@@ -1,54 +1,56 @@
   <strong>Sign in using</strong>
-  <ul class="inputs">
+  <div class="form_section">
+      <ul class="inputs">
 
-      <li>
-          <label for="email" class="serif">Email</label>
-          <input id="email" class="sans" type="email" autocapitalize="off" autocorrect="off" value="<%= email %>" />
+          <li>
+              <label for="email" class="serif">Email</label>
+              <input id="email" class="sans" type="email" autocapitalize="off" autocorrect="off" value="<%= email %>" />
 
-          <div id="email_format" class="tooltip" for="email">
-            This field must be an email address.
-          </div>
+              <div id="email_format" class="tooltip" for="email">
+                This field must be an email address.
+              </div>
 
-          <div id="email_required" class="tooltip" for="email">
-            The email field is required.
-          </div>
-      </li>
+              <div id="email_required" class="tooltip" for="email">
+                The email field is required.
+              </div>
+          </li>
 
-      <li id="hint_section" class="start">
-          <p>Enter your email address to sign in to <strong><%= sitename %></strong></p>
-      </li>
+          <li id="hint_section" class="start">
+              <p>Enter your email address to sign in to <strong><%= sitename %></strong></p>
+          </li>
 
-      <li id="create_text_section" class="newuser">
-          <p><strong>Welcome to BrowserID!</strong></p>
-          <p>This email looks new, so let's get you set up.</p>
-      </li>
+          <li id="create_text_section" class="newuser">
+              <p><strong>Welcome to BrowserID!</strong></p>
+              <p>This email looks new, so let's get you set up.</p>
+          </li>
 
-      <li id="password_section" class="returning">
+          <li id="password_section" class="returning">
 
-          <label for="password" class="half serif">Password</label>
-          <div class="half right">
-              <a id="forgotPassword" href="#">forgot your password?</a>
-          </div>
-          <input id="password" class="sans" type="password" maxlength="80">
+              <label for="password" class="half serif">Password</label>
+              <div class="half right">
+                  <a id="forgotPassword" href="#">forgot your password?</a>
+              </div>
+              <input id="password" class="sans" type="password" maxlength="80">
 
 
-          <div id="password_required" class="tooltip" for="password">
-            The password field is required.
-          </div>
+              <div id="password_required" class="tooltip" for="password">
+                The password field is required.
+              </div>
 
-          <div id="cannot_authenticate" class="tooltip" for="password">
-            The account cannot be logged in with this username and password.
-          </div>
-      </li>
-  
-  </ul>
+              <div id="cannot_authenticate" class="tooltip" for="password">
+                The account cannot be logged in with this username and password.
+              </div>
+          </li>
+      
+      </ul>
 
-  <div class="submit cf">
-      <button class="start">next</button>
-      <button class="newuser">Verify Email</button>
+      <div class="submit cf">
+          <button class="start">next</button>
+          <button class="newuser">Verify Email</button>
 
-      <button class="returning">sign in</button>
+          <button class="returning">sign in</button>
 
-      <button class="forgot">Reset Password</button>
-      <button id="cancel_forgot_password" class="forgot">Cancel</button>
+          <button class="forgot">Reset Password</button>
+          <button id="cancel_forgot_password" class="forgot">Cancel</button>
+      </div>
   </div>