diff --git a/resources/static/pages/js/verify_secondary_address.js b/resources/static/pages/js/verify_secondary_address.js
index ee9e2227c2bb35be670dd0962599f849208360b2..793538d61710ee4d6a523defa73010443f9e3157 100644
--- a/resources/static/pages/js/verify_secondary_address.js
+++ b/resources/static/pages/js/verify_secondary_address.js
@@ -119,6 +119,7 @@ BrowserID.verifySecondaryAddress = (function() {
           // These are users who are authenticating in a different browser or
           // session than the initiator.
           dom.addClass("body", "enter_password");
+          dom.focus("input[autofocus]");
           complete(oncomplete, true);
         }
         else {