diff --git a/src/app/settings/settingsController.js b/src/app/settings/settingsController.js
index 7e81cd931e..c7021531ad 100644
--- a/src/app/settings/settingsController.js
+++ b/src/app/settings/settingsController.js
@@ -52,11 +52,19 @@
         };
 
         $scope.twoFactor = function () {
-            $uibModal.open({
+            var twoFactorModal = $uibModal.open({
                 animation: true,
                 templateUrl: 'app/settings/views/settingsTwoFactor.html',
                 controller: 'settingsTwoFactorController'
             });
+
+            twoFactorModal.result.then(function (enabled) {
+                if (enabled == null) {
+                    return;
+                }
+
+                $scope.model.twoFactorEnabled = enabled;
+            });
         };
 
         $scope.sessions = function () {
diff --git a/src/app/settings/settingsTwoFactorController.js b/src/app/settings/settingsTwoFactorController.js
index dfd125d20d..0c8d4d3b03 100644
--- a/src/app/settings/settingsTwoFactorController.js
+++ b/src/app/settings/settingsTwoFactorController.js
@@ -83,6 +83,6 @@
         }
 
         $scope.close = function () {
-            $uibModalInstance.dismiss('cancel');
+            $uibModalInstance.close(!_profile.extended ? null : _profile.extended.twoFactorEnabled);
         };
     });
diff --git a/src/app/settings/views/settingsTwoFactor.html b/src/app/settings/views/settingsTwoFactor.html
index 8cdfa7f5b4..4b4bfc7b14 100644
--- a/src/app/settings/views/settingsTwoFactor.html
+++ b/src/app/settings/views/settingsTwoFactor.html
@@ -64,7 +64,9 @@
                     print the recovery code below and keep it in a safe place.
                 </p>
                 <p><strong>Recovery Code:</strong> <code>{{twoFactorModel.recovery}}</code></p>
-                <button class="btn btn-default" ng-click="print(twoFactorModel.recovery)"><i class="fa fa-print"></i> Print</button>
+                <button type="button" class="btn btn-default" ng-click="print(twoFactorModel.recovery)">
+                    <i class="fa fa-print"></i> Print
+                </button>
             </div>
         </div>
         <div class="callout callout-danger validation-errors" ng-show="updateTwoStepForm.$errors">
@@ -74,7 +76,7 @@
             </ul>
         </div>
         <hr ng-show="enabled()" />
-        <h4 style="margin-top: 30px;"><span ng-show="enabled()">What to disable? </span><span ng-show="!enabled()">3. </span>Enter the resulting verification code from the app</h4>
+        <h4 style="margin-top: 30px;"><span ng-show="enabled()">Want to disable? </span><span ng-show="!enabled()">3. </span>Enter the resulting verification code from the app</h4>
         <div class="form-group" show-errors>
             <label for="token" class="sr-only">Verification Code</label>
             <input type="text" id="token" name="Token" placeholder="Verification Code" ng-model="updateModel.token" class="form-control" required api-field />