diff --git a/resources/static/dialog/css/m.css b/resources/static/dialog/css/m.css
index 3c5ad50a1940818c89f61b4f5302d756563f8ae4..d397dad3626eeb86708aba7379ba76d400370f8f 100644
--- a/resources/static/dialog/css/m.css
+++ b/resources/static/dialog/css/m.css
@@ -103,6 +103,10 @@
     margin-top: 20px;
   }
 
+  #signIn .submit {
+    position: static;
+  }
+
   #signIn .submit > p {
     font-size: 14px;
   }
@@ -115,9 +119,18 @@
 
   #content, .form_section, .pickemail .inputs, .vertical {
     height: auto;
+    max-height: none;
     overflow: visible;
   }
 
+  .pickemail .vertical a {
+    font-size: 1.2em;
+  }
+
+  #useNewEmail {
+    margin-top: 18px;
+  }
+
   #error .vertical, #wait .vertical {
       height: 250px;
   }
diff --git a/resources/static/dialog/css/popup.css b/resources/static/dialog/css/popup.css
index d464b2a3b1763e3e31662a05757fefb0a5495c0e..73c52f72bdd2564708f1f8d99fd31637693e924a 100644
--- a/resources/static/dialog/css/popup.css
+++ b/resources/static/dialog/css/popup.css
@@ -245,7 +245,7 @@ section > .contents {
 }
 
 #signIn .vertical {
-    padding: 15px 20px 20px 20px;
+    padding: 0 20px;
 }
 
 #signIn .vertical ul {
@@ -262,8 +262,11 @@ section > .contents {
 }
 
 #signIn .submit {
-    margin-top: 10px;
     line-height: 28px;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
 }
 
 #signIn .submit > p {
@@ -566,17 +569,17 @@ html[xmlns] .cf {
     margin: 1em 0 .5em;
     padding: 0 1em;
     line-height: 18px;
-    min-height: 110px;
 }
 
 .pickemail .inputs {
-    height: 110px;
-    min-height: 0;
+    max-height: 110px;
     overflow-y: auto;
+    position: relative;
 }
 
 .form_section {
     height: 176px;
+    position: relative;
 }
 
 .add {
@@ -594,6 +597,20 @@ label[for=remember] {
 
 #thisIsNotMe {
   margin-right: 10px;
+  float: right;
+}
+
+#useNewEmail {
+  margin-left: 0.8em;
+}
+
+.pickemail .vertical a {
+  background-color: #F0EFED;
+  color: #4E4E4E;
+  font-size: 0.75em;
+  padding: 0 5px;
+  display: inline-block;
+  line-height: 18px;
 }
 
 #addEmail {
@@ -601,7 +618,7 @@ label[for=remember] {
 }
 
 .submit > button {
-    margin: 0 5px 15px 0;
+    margin: 0 5px 0 0;
 }
 
 #newEmail {
diff --git a/resources/static/dialog/views/pickemail.ejs b/resources/static/dialog/views/pickemail.ejs
index 0a0319b02df1b25a00b7fdf848758c6ccd5a1d49..0ebe58b9b7335e34033bb6589daf7c20def2fea5 100644
--- a/resources/static/dialog/views/pickemail.ejs
+++ b/resources/static/dialog/views/pickemail.ejs
@@ -1,3 +1,4 @@
+  <a id="thisIsNotMe" href="#">This is not me...</a>
   <strong>Sign in using</strong>
 
   <div id="selectEmail" class="form_section">
@@ -14,6 +15,7 @@
               </li>
           <% }); %>
       </ul>
+      <a id="useNewEmail" href="#">Use a different email</a>
 
       <div class="submit add cf">
 
@@ -27,8 +29,6 @@
           <button id="signInButton">sign in</button>
 
           <p>
-            <a id="thisIsNotMe" href="#">This is not me</a>
-            <a id="useNewEmail" href="#">Use a different email</a>
           </p>
       </div>
   </div>