diff --git a/resources/static/test/qunit/pages/add_email_address_test.js b/resources/static/test/qunit/pages/add_email_address_test.js
index 656e1ac01ed85adff0fe08a796a4193d73dd1a75..06544ba896000a4138163d6ca62e505d846cf038 100644
--- a/resources/static/test/qunit/pages/add_email_address_test.js
+++ b/resources/static/test/qunit/pages/add_email_address_test.js
@@ -171,6 +171,17 @@
     expectTooltipVisible();
   });
 
+  asyncTest("password: too long of a password", function() {
+    var tooLong = "";
+    for(var i = 0; i < 81; i++) {
+      tooLong += (i % 10);
+    }
+    $("#password").val(tooLong);
+    $("#vpassword").val(tooLong);
+
+    expectTooltipVisible();
+  });
+
   asyncTest("password: mismatched passwords", function() {
     $("#password").val("passwords");
     $("#vpassword").val("password");
diff --git a/resources/views/add_email_address.ejs b/resources/views/add_email_address.ejs
index 92b1c0e47da582e1105d96db1f090d00980ef855..61569dd8f3c7371cd910ed8f9af9f46c839a9639 100644
--- a/resources/views/add_email_address.ejs
+++ b/resources/views/add_email_address.ejs
@@ -23,8 +23,8 @@
                       Password is required.
                     </div>
 
-                    <div class="tooltip" id="password_too_short" for="password">
-                      Password must be at least 8 characters long.
+                    <div class="tooltip" id="password_length" for="password">
+                      Password must be between 8 and 80 characters long.
                     </div>
                 </li>
                 <li>