diff --git a/src/views/account.html b/src/views/account.html
index d9f521280..7f2ddc215 100644
--- a/src/views/account.html
+++ b/src/views/account.html
@@ -163,6 +163,33 @@
   </div>
 </div>
 
+<!-- Modal disable twofactor authentication -->
+<div class="modal fade" id="twoFactorAuthenticationDisableModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">Disable Two-Factor Authentication</h4>
+        </div>
+        <div class="modal-body">
+          <form name="twoFactorAuthenticationDisableForm" role="form" novalidate ng-submit="twoFactorAuthentication.disable()" autocomplete="off">
+            <div class="form-group" ng-class="{ 'has-error': (!twoFactorAuthenticationDisableForm.password.$dirty && twoFactorAuthentication.error) || (twoFactorAuthenticationDisableForm.password.$dirty && twoFactorAuthenticationDisableForm.password.$invalid) }">
+              <label class="control-label">Password</label>
+              <div class="control-label" ng-show="(!twoFactorAuthenticationDisableForm.password.$dirty && twoFactorAuthentication.error) || (twoFactorAuthenticationDisableForm.password.$dirty && twoFactorAuthenticationDisableForm.password.$invalid)">
+                <small>{{ twoFactorAuthentication.error }}</small>
+              </div>
+              <input type="password" class="form-control" ng-model="twoFactorAuthentication.password" id="twoFactorAuthenticationPasswordInput" name="password" required autofocus>
+            </div>
+            <input class="ng-hide" type="submit" ng-disabled="twoFactorAuthenticationDisableForm.$invalid"/>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+          <button type="button" class="btn btn-success" ng-click="twoFactorAuthentication.disable()" ng-disabled="twoFactorAuthenticationDisableForm.$invalid || twoFactorAuthentication.busy"><i class="fa fa-circle-o-notch fa-spin" ng-show="twoFactorAuthentication.busy"></i> Disable</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
 <div class="content">
 
   <div class="text-left">
diff --git a/src/views/account.js b/src/views/account.js
index e283eb7ee..616d346bb 100644
--- a/src/views/account.js
+++ b/src/views/account.js
@@ -28,6 +28,8 @@ angular.module('Application').controller('AccountController', ['$scope', 'Client
 
             $scope.twoFactorAuthenticationEnableForm.$setUntouched();
             $scope.twoFactorAuthenticationEnableForm.$setPristine();
+            $scope.twoFactorAuthenticationDisableForm.$setUntouched();
+            $scope.twoFactorAuthenticationDisableForm.$setPristine();
         },
 
         show: function () {
@@ -70,12 +72,16 @@ angular.module('Application').controller('AccountController', ['$scope', 'Client
         disable: function () {
             $scope.twoFactorAuthentication.busy = true;
 
-            Client.disableTwoFactorAuthentication($scope.twoFactorAuthentication.totpToken, function (error) {
+            Client.disableTwoFactorAuthentication($scope.twoFactorAuthentication.password, function (error) {
                 $scope.twoFactorAuthentication.busy = false;
 
                 if (error) {
                     $scope.twoFactorAuthentication.error = error.message;
-                    console.error(error);
+
+                    $scope.twoFactorAuthentication.password = '';
+                    $scope.twoFactorAuthenticationDisableForm.password.$setPristine();
+                    $('#twoFactorAuthenticationPasswordInput').focus();
+
                     return;
                 }
 
@@ -330,7 +336,7 @@ angular.module('Application').controller('AccountController', ['$scope', 'Client
     });
 
     // setup all the dialog focus handling
-    ['passwordChangeModal', 'emailChangeModal', 'fallbackEmailChangeModal', 'displayNameChangeModal', 'twoFactorAuthenticationEnableModal'].forEach(function (id) {
+    ['passwordChangeModal', 'emailChangeModal', 'fallbackEmailChangeModal', 'displayNameChangeModal', 'twoFactorAuthenticationEnableModal', 'twoFactorAuthenticationDisableModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
             $(this).find("[autofocus]:first").focus();
         });