diff --git a/browserid/static/dialog/views/authenticate.ejs b/browserid/static/dialog/views/authenticate.ejs
index 1cc9aa8b51be9f8ce25d6747b33defe68923b23a..35cc4abd717c8d3323426675e637e7630f4754c7 100644
--- a/browserid/static/dialog/views/authenticate.ejs
+++ b/browserid/static/dialog/views/authenticate.ejs
@@ -2,11 +2,11 @@
     <p class="prompt">Signing into <span class="sitename bad"><%= sitename %></span>:</p>
     <div class="formRow">
       <label for="email_input"> Email </label>
-      <input type="email" id="email_input" />
+      <input type="email" id="email_input" required />
     </div>
     <div class="formRow">
       <label for="password_input"> Password </label>
-      <input type="password" id="password_input" />
+      <input type="password" id="password_input" pattern=".{5,}" required/>
       <a href="#" id="forgotpassword">I forgot my password</a>
     </div>
     <div class="attention_lame" id="nosuchaccount" style="display:none;">
diff --git a/browserid/static/dialog/views/create.ejs b/browserid/static/dialog/views/create.ejs
index 64fa141f02a7113a791ef6277de8704aefeaaabb..07b5c1e0a650ae2be95a698eab5b38cc39cb904f 100644
--- a/browserid/static/dialog/views/create.ejs
+++ b/browserid/static/dialog/views/create.ejs
@@ -9,17 +9,17 @@
     </div>
     <div class="formRow">
       <label for="password_input"> Password </label>
-      <input id="password_input" type="password"/>
+      <input id="password_input" type="password" pattern=".{5,}"/>
     </div>
     <div class="formRow">
       <label for="password_verify_input"> Verify </label>
-      <input id="password_verify_input" type="password"/>
+      <input id="password_verify_input" type="password" pattern=".{5,}"/>
       <span class="note passwordnote" id="enter_a_password"><span class="bad">Enter a password</span></span>
       <span class="note passwordnote" id="passwords_different" style="display:none;"><span class="bad">Passwords different</span></span>
       <span class="note passwordnote" id="password_too_short" style="display:none;"><span class="bad">Password too short</span></span>
       <span class="note passwordnote" id="password_ok" style="display:none;"><span class="good">Password OK</span></span>
     </div>
     <div class="attention_lame" style="display:none;" id="emailinuse_message">
-      <span id="in_use_email">Email</span> in use, If this email is yours you can <a href="#" id="suggest_signin">sign in</a> with it?
+      <span id="in_use_email">Email</span> in use, If this email is yours you can <a href="#" id="suggest_signin" tabindex="0">sign in</a> with it?
     </div>
   </div>
diff --git a/browserid/static/dialog/views/forgotpassword.ejs b/browserid/static/dialog/views/forgotpassword.ejs
index 2ee1d184bad0dcdd605bded04135ec676e7829c7..7f0870ec35b09b86743a0a1c6efb103ee3b3eb60 100644
--- a/browserid/static/dialog/views/forgotpassword.ejs
+++ b/browserid/static/dialog/views/forgotpassword.ejs
@@ -7,17 +7,17 @@
     </div>
     <div class="formRow">
       <label for="password_input"> Password </label>
-      <input id="password_input" type="password"/>
+      <input id="password_input" type="password" pattern=".{5,}"/>
     </div>
     <div class="formRow">
       <label for="password_verify_input"> Verify </label>
-      <input id="password_verify_input" type="password"/>
+      <input id="password_verify_input" type="password" pattern=".{5,}"/>
       <span class="note passwordnote" id="enter_a_password"><span class="bad">Enter a password</span></span>
       <span class="note passwordnote" id="passwords_different" style="display:none;"><span class="bad">Passwords different</span></span>
       <span class="note passwordnote" id="password_too_short" style="display:none;"><span class="bad">Password too short</span></span>
       <span class="note passwordnote" id="password_ok" style="display:none;"><span class="good">Password OK</span></span>
     </div>
     <div class="attention_lame" style="display:none;" id="emailinuse_message">
-      <span id="in_use_email">Email</span> in use, If this email is yours you can <a href="#">sign in</a> with it?
+      <span id="in_use_email">Email</span> in use, If this email is yours you can <a tabindex="0" href="#">sign in</a> with it?
     </div>
   </div>