diff --git a/static/js/app.js b/static/js/app.js
index d23235a66..e0b431d7b 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -816,7 +816,31 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
           
           // If the error is a fresh login required, show the dialog.
           if (resp.status == 401 && resp.data['error_type'] == 'fresh_login_required') {
-            bootbox.dialog({
+            var verifyNow = function() {
+              if (!$('#freshPassword').val()) { return; }
+
+              var info = {
+                'password': $('#freshPassword').val()
+              };
+
+              $('#freshPassword').val('');
+
+              // Conduct the sign in of the user.
+              apiService.verifyUser(info).then(function() {
+                // On success, retry the operation. if it succeeds, then resolve the
+                // deferred promise with the result. Otherwise, reject the same.
+                apiService[opName].apply(apiService, opArgs).then(function(resp) {
+                  deferred.resolve(resp);
+                }, function(resp) {
+                  deferred.reject(resp);
+                });
+              }, function(resp) {
+                // Reject with the sign in error.
+                deferred.reject({'data': {'message': 'Invalid verification credentials'}});
+              });
+            };
+           
+            var box = bootbox.dialog({
               "message": 'It has been more than a few minutes since you last logged in, ' +
                 'so please verify your password to perform this sensitive operation:' + 
                 '<form style="margin-top: 10px" action="javascript:void(0)">' +
@@ -827,38 +851,26 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
                 "verify": {
                   "label": "Verify",
                   "className": "btn-success",
-                  "callback": function() {
-                    var info = {
-                      'password': $('#freshPassword').val()
-                    };
-
-                    $('#freshPassword').val('');
-
-                    // Conduct the sign in of the user.
-                    apiService.verifyUser(info).then(function() {
-                      // On success, retry the operation. if it succeeds, then resolve the
-                      // deferred promise with the result. Otherwise, reject the same.
-                      apiService[opName].apply(apiService, opArgs).then(function(resp) {
-                        deferred.resolve(resp);
-                      }, function(resp) {
-                        deferred.reject(resp);
-                      });
-                    }, function(resp) {
-                      // Reject with the sign in error.
-                      deferred.reject({'data': {'message': 'Invalid verification credentials'}});
-                    });
-                  }
+                  "callback": verifyNow
                 },
                 "close": {
                   "label": "Cancel",
                   "className": "btn-default",
                   "callback": function() {
-                    deferred.reject(resp);
+                    deferred.reject({'data': {'message': 'Verification canceled'}});
                   }
                 }
               }
             });
 
+            box.bind('shown.bs.modal', function(){
+              box.find("input").focus();
+              box.find("form").submit(function() {
+                box.modal('hide');
+                verifyNow();
+              });
+            });
+
             // Return a new promise. We'll accept or reject it based on the result
             // of the login.
             return deferred.promise;