diff --git a/resources/static/dialog/views/authenticate.ejs b/resources/static/dialog/views/authenticate.ejs
index f3c677f0c3d506fd84c364fa158658dcb56c5055..285c4f58a1112e0d360486a909ba613c164e0a09 100644
--- a/resources/static/dialog/views/authenticate.ejs
+++ b/resources/static/dialog/views/authenticate.ejs
@@ -25,6 +25,10 @@
               <div id="could_not_add" class="tooltip" for="email">
                 <%= gettext('We just sent an email to that address! If you really want to send another, wait a minute or two and try again.') %>
               </div>
+
+              <div id="cannot_authenticate" class="tooltip" for="email">
+                <%= gettext('This email address and password do not match.') %>
+              </div>
           </li>
 
 
@@ -42,9 +46,6 @@
                 <%= gettext('The password field is required.') %>
               </div>
 
-              <div id="cannot_authenticate" class="tooltip" for="password">
-                <%= gettext('This email address and password do not match.') %>
-              </div>
           </li>
 
       </ul>
diff --git a/resources/static/dialog/views/set_password.ejs b/resources/static/dialog/views/set_password.ejs
index d9bb25f53333b51cfee3ea111b14468208797f98..74a75f3d11d4da5eacea04ecc4e7506a94e415ea 100644
--- a/resources/static/dialog/views/set_password.ejs
+++ b/resources/static/dialog/views/set_password.ejs
@@ -35,6 +35,10 @@
               <div id="could_not_add" class="tooltip" for="password">
                 <%= gettext('We just sent an email to that address! If you really want to send another, wait a minute or two and try again.') %>
               </div>
+
+              <div class="tooltip" id="passwords_no_match" for="password">
+                <%= gettext('These passwords don\'t match!') %>
+              </div>
           </li>
 
           <li>
@@ -45,9 +49,6 @@
                 <%= gettext('Verification password is required.') %>
               </div>
 
-              <div class="tooltip" id="passwords_no_match" for="vpassword">
-                <%= gettext('These passwords don\'t match!') %>
-              </div>
           </li>
 
       </ul>
diff --git a/resources/views/signin.ejs b/resources/views/signin.ejs
index a255e7df4922e64885f358d927fde0615ac8533b..3d4d0a7bda054b5d1718198e916e5b1d4b2a88a4 100644
--- a/resources/views/signin.ejs
+++ b/resources/views/signin.ejs
@@ -39,6 +39,11 @@
                       <%- gettext('We just sent an email to that address! If you really want to send another, wait a minute or two and try again.') %>
                     </div>
 
+                    <div id="cannot_authenticate" class="tooltip" for="email">
+                      <%- gettext('This email address and password do not match.') %>
+                    </div>
+
+
                 </li>
 
                 <li class="password_entry vpassword_entry">
@@ -51,14 +56,13 @@
                       <%- gettext('The password field is required.') %>
                     </div>
 
-                    <div id="cannot_authenticate" class="tooltip" for="password">
-                      <%- gettext('This email address and password do not match.') %>
-                    </div>
-
                     <div class="tooltip" id="password_length" for="password">
                         <%- gettext('Password must be between 8 and 80 characters long.') %>
                     </div>
 
+                    <div class="tooltip" id="passwords_no_match" for="password">
+                      <%- gettext('These passwords don\'t match!') %>
+                    </div>
                 </li>
 
                 <li class="vpassword_entry">
@@ -69,9 +73,6 @@
                       <%- gettext('Verification password is required.') %>
                     </div>
 
-                    <div class="tooltip" id="passwords_no_match" for="vpassword">
-                      <%- gettext('These passwords don\'t match!') %>
-                    </div>
 
                 </li>
             </ul>