diff --git a/browserid/static/dialog/views/authenticate.ejs b/browserid/static/dialog/views/authenticate.ejs
index 65e4042a59111c054db35c7abaacb0912f9dbd6a..601fd42e3eb5b1f0176b2994914cdcdee06b506b 100644
--- a/browserid/static/dialog/views/authenticate.ejs
+++ b/browserid/static/dialog/views/authenticate.ejs
@@ -32,7 +32,7 @@
                             <div class="half right">
                                 <a id="forgotPassword" href="#">forgot your password?</a>
                             </div>
-                            <input id="password" class="sans" type="password">
+                            <input id="password" class="sans" type="password" maxlength="80">
                         </div>
 
                         <div id="hint_section" class="start">
diff --git a/browserid/views/signin.ejs b/browserid/views/signin.ejs
index 1d9cb176ee0fac85eb7b868f5a13dda20a199f2e..2edf5cd2182307e180d53c49b7b1d49b966be83f 100644
--- a/browserid/views/signin.ejs
+++ b/browserid/views/signin.ejs
@@ -19,7 +19,7 @@
                         <!-- XXX: this needs to be fixed -->
                         <a class="forgot" href="/forgot" tabindex="4">forgot your password?</a>
                     </div>
-                    <input class="sans" id="password" placeholder="Your Password" type="password" required x-moz-errormessage="Oops!  We need your password to sign you in" tabindex="2">
+                    <input class="sans" id="password" placeholder="Your Password" type="password" required x-moz-errormessage="Oops!  We need your password to sign you in" tabindex="2" maxlength="80">
                 </li>
             </ul>
 
diff --git a/browserid/views/verifyuser.ejs b/browserid/views/verifyuser.ejs
index 5db397c5fb652ab1e573edb40bed002a52915e5b..66ce2e6203a0783e0b5d2f23d38673c389863b5d 100644
--- a/browserid/views/verifyuser.ejs
+++ b/browserid/views/verifyuser.ejs
@@ -10,11 +10,11 @@
         </li>
         <li>
             <label class="serif" for="password">New Password</label>
-            <input required class="sans" id="password" placeholder="Enter a Password" type="password" autofocus>
+            <input required class="sans" id="password" placeholder="Enter a Password" type="password" autofocus maxlength=80>
         </li>
         <li>
             <label class="serif" for="vpassword">Verify Password</label>
-            <input required class="sans" id="vpassword" placeholder="Repeat Password" type="password">
+            <input required class="sans" id="vpassword" placeholder="Repeat Password" type="password" maxlength=80>
         </li>
       </ul>
       <div class="submit cf">
@@ -45,4 +45,4 @@ $(document).ready(function() {
        $('#signUpFormWrap').html('There was a problem with your signup link.');
    });
 });
-</script>
\ No newline at end of file
+</script>