diff --git a/src/translation/en.json b/src/translation/en.json
index 1fac791b4..bfa469ec2 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -163,7 +163,7 @@
             "inactiveTooltip": "User is inactive",
             "externalLdapTooltip": "From external LDAP directory",
             "notActivatedYetTooltip": "User is not activated yet",
-            "resetPasswordTooltip": "Reset password or invite link",
+            "resetPasswordTooltip": "Reset password, disable 2FA or send invite link",
             "editUserTooltip": "Edit User",
             "removeUserTooltip": "Remove User",
             "transferOwnershipTooltip": "Transfer Ownership"
@@ -267,9 +267,10 @@
             "deleteAction": "Delete"
         },
         "passwordResetDialog": {
-            "title": "Reset password or invite link for {{ username }}",
+            "title": "Reset password, disable 2FA or invite link for {{ username }}",
             "description": "Use the link below to reset {{ username }}'s password or re-invite:",
-            "sendEmailLinkAction": "Email link to user"
+            "sendEmailLinkAction": "Email link to user",
+            "disable2FAAction": "Disable 2FA"
         },
         "externalLdapDialog": {
             "title": "Configure LDAP"
@@ -1119,6 +1120,12 @@
         "mailboxboxDialog": {
             "usersHeader": "Users",
             "groupsHeader": "Groups"
+        },
+        "updateMailinglistDialog": {
+            "activeCheckbox": "Mailing list is active"
+        },
+        "updateMailboxDialog": {
+            "activeCheckbox": "Mailbox is active"
         }
     },
     "app": {
diff --git a/src/views/users.html b/src/views/users.html
index 7ce0d9360..307190d0d 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -317,7 +317,7 @@
   </div>
 </div>
 
-<!-- Modal invite -->
+<!-- Modal invite/reset -->
 <div class="modal fade" id="invitationModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
     <div class="modal-content">
@@ -335,6 +335,7 @@
         <br/>
       </div>
       <div class="modal-footer">
+        <button type="button" class="btn btn-danger pull-left" ng-click="invitation.reset2FA()" ng-disabled="!invitation.user.twoFactorAuthenticationEnabled || invitation.reset2FABusy"><i class="fa fa-circle-notch fa-spin" ng-show="invitation.reset2FABusy"></i> {{ 'users.passwordResetDialog.disable2FAAction' | tr }}</button>
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
         <button type="button" class="btn btn-success" ng-click="invitation.email()" ng-disabled="invitation.busy"><i class="fa fa-circle-notch fa-spin" ng-show="invitation.busy"></i> {{ 'users.passwordResetDialog.sendEmailLinkAction' | tr }}</button>
       </div>
diff --git a/src/views/users.js b/src/views/users.js
index 57203e277..179466be1 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -525,6 +525,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
     $scope.invitation = {
         busy: false,
+        reset2FABusy: false,
         setupLink: '',
         user: null,
 
@@ -532,6 +533,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.invitation.user = user;
             $scope.invitation.setupLink = '';
             $scope.invitation.busy = false;
+            $scope.invitation.reset2FABusy = false;
 
             Client.createInvite(user.id, function (error, result) {
                 if (error) return console.error(error);
@@ -548,6 +550,20 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             Client.sendInvite($scope.invitation.user.id, function (error) {
                 $scope.invitation.busy = false;
                 if (error) return console.error(error);
+                $('#invitationModal').modal('hide');
+            });
+        },
+
+        reset2FA: function () {
+            $scope.invitation.reset2FABusy = true;
+
+            Client.disableTwoFactorAuthenticationByUserId($scope.invitation.user.id, function (error) {
+                $scope.invitation.reset2FABusy = false;
+                if (error) return console.error(error);
+
+                // ensure to update changed user state
+                refreshUsers();
+
                 $('#invitationModal').modal('hide');
             });
         }