diff --git a/src/app/settings/settingsTwoStepAuthenticatorController.js b/src/app/settings/settingsTwoStepAuthenticatorController.js
index 2110a82d677..e21e51e12e3 100644
--- a/src/app/settings/settingsTwoStepAuthenticatorController.js
+++ b/src/app/settings/settingsTwoStepAuthenticatorController.js
@@ -91,7 +91,18 @@
             }).$promise;
         }
 
+        var closing = false;
         $scope.close = function () {
+            closing = true;
             $uibModalInstance.close($scope.enabled);
         };
+
+        $scope.$on('modal.closing', function (e, reason, closed) {
+            if (closing) {
+                return;
+            }
+
+            e.preventDefault();
+            $scope.close();
+        });
     });
diff --git a/src/app/settings/settingsTwoStepDuoController.js b/src/app/settings/settingsTwoStepDuoController.js
index 9a8a3ed70e9..20ed5144c03 100644
--- a/src/app/settings/settingsTwoStepDuoController.js
+++ b/src/app/settings/settingsTwoStepDuoController.js
@@ -75,7 +75,18 @@
             };
         }
 
+        var closing = false;
         $scope.close = function () {
+            closing = true;
             $uibModalInstance.close($scope.enabled);
         };
+        
+        $scope.$on('modal.closing', function (e, reason, closed) {
+            if (closing) {
+                return;
+            }
+
+            e.preventDefault();
+            $scope.close();
+        });
     });
diff --git a/src/app/settings/settingsTwoStepEmailController.js b/src/app/settings/settingsTwoStepEmailController.js
index f6bc85ca549..42133f7a1f3 100644
--- a/src/app/settings/settingsTwoStepEmailController.js
+++ b/src/app/settings/settingsTwoStepEmailController.js
@@ -97,7 +97,18 @@
             }).$promise;
         }
 
+        var closing = false;
         $scope.close = function () {
+            closing = true;
             $uibModalInstance.close($scope.enabled);
         };
+
+        $scope.$on('modal.closing', function (e, reason, closed) {
+            if (closing) {
+                return;
+            }
+
+            e.preventDefault();
+            $scope.close();
+        });
     });
diff --git a/src/app/settings/settingsTwoStepU2fController.js b/src/app/settings/settingsTwoStepU2fController.js
index f72fae46d7d..c92cf2842d1 100644
--- a/src/app/settings/settingsTwoStepU2fController.js
+++ b/src/app/settings/settingsTwoStepU2fController.js
@@ -102,10 +102,16 @@
         }
 
         $scope.close = function () {
+            closed = true;
             $uibModalInstance.close($scope.enabled);
         };
 
-        $scope.$on('modal.closing', function (event) {
-            closed = true;
+        $scope.$on('modal.closing', function (e, reason, isClosed) {
+            if (closed) {
+                return;
+            }
+
+            e.preventDefault();
+            $scope.close();
         });
     });
diff --git a/src/app/settings/settingsTwoStepYubiController.js b/src/app/settings/settingsTwoStepYubiController.js
index 55d512ec445..7adfe28256b 100644
--- a/src/app/settings/settingsTwoStepYubiController.js
+++ b/src/app/settings/settingsTwoStepYubiController.js
@@ -99,7 +99,18 @@
             return str;
         }
 
+        var closing = false;
         $scope.close = function () {
+            closing = true;
             $uibModalInstance.close($scope.enabled);
         };
+
+        $scope.$on('modal.closing', function (e, reason, closed) {
+            if (closing) {
+                return;
+            }
+
+            e.preventDefault();
+            $scope.close();
+        });
     });
diff --git a/src/app/settings/views/settingsTwoStepYubi.html b/src/app/settings/views/settingsTwoStepYubi.html
index 68a337201fa..5853e77cf31 100644
--- a/src/app/settings/views/settingsTwoStepYubi.html
+++ b/src/app/settings/views/settingsTwoStepYubi.html
@@ -38,7 +38,7 @@
             </p>
             <p>Supported platforms:</p>
             <ul>
-                <li>Web vault on a device with a USB port.</li>
+                <li>Web vault on a device with a USB port that can accept your YubiKey.</li>
                 <li>Browser extensions.</li>
                 <li>
                     Android on a device with