diff --git a/src/translation/en.json b/src/translation/en.json
index ad9062b3f..92f14184d 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -267,15 +267,15 @@
             "deleteAction": "Delete"
         },
         "passwordResetDialog": {
-            "title": "Reset password, disable 2FA or invite link for {{ username }}",
+            "title": "Password/2FA reset for {{ username }}",
             "description": "Use the link below to reset {{ username }}'s password or re-invite:",
             "sendEmailLinkAction": "Email link to user",
             "disable2FAAction": "Disable 2FA",
             "emailSent": "Sent",
-            "no2FASetup": "This user has no 2FA set up.",
-            "2FAIsSetup": "This user has 2FA enabled. If the user has problems to log in, the 2FA setup can be disabled here until the user enables it again.",
+            "no2FASetup": "This user has not set up 2FA.",
+            "2FAIsSetup": "Use this to disable user's 2FA. The user can set it up again from the Profile view.",
             "newLinkAction": "Generate new link",
-            "resetLinkExplanation": "If the password rest or invite link is expired or lost, a new one can be generated. A new reset and invite link, will invalidate the old link immediately."
+            "resetLinkExplanation": "Use this to generate a password reset or invitation link. The new link will invalidate any old link immediately."
         },
         "externalLdapDialog": {
             "title": "Configure LDAP"
diff --git a/src/views/profile.html b/src/views/profile.html
index 8cedc42a8..b09e6b0c8 100644
--- a/src/views/profile.html
+++ b/src/views/profile.html
@@ -364,7 +364,7 @@
             <tr>
               <td class="text-right" colspan="2" style="vertical-align: top;">
               <br/>
-                <button class="btn btn-primary" ng-click="twoFactorAuthentication.show()">{{ user.twoFactorAuthenticationEnabled ? 'profile.disable2FAAction' : 'profile.enable2FAAction' | tr }}</button>
+                <button class="btn" ng-class="user.twoFactorAuthenticationEnabled ? 'btn-danger' : 'btn-success'" ng-click="twoFactorAuthentication.show()">{{ user.twoFactorAuthenticationEnabled ? 'profile.disable2FAAction' : 'profile.enable2FAAction' | tr }}</button>
                 <button class="btn btn-primary" ng-click="passwordchange.show()" ng-hide="user.source">{{ 'profile.changePasswordAction' | tr }}</button>
               </td>
             </tr>
diff --git a/src/views/users.html b/src/views/users.html
index c4cc904fa..fce03ebcb 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -344,7 +344,7 @@
         <div>
           <p ng-hide="invitation.user.twoFactorAuthenticationEnabled">{{ 'users.passwordResetDialog.no2FASetup' | tr }}</p>
           <p ng-show="invitation.user.twoFactorAuthenticationEnabled">{{ 'users.passwordResetDialog.2FAIsSetup' | tr }}</p>
-          <button type="button" class="btn btn-danger" ng-click="invitation.reset2FA()" ng-show="invitation.user.twoFactorAuthenticationEnabled" ng-disabled="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-danger" 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>
         </div>
       </div>
       <div class="modal-footer">
diff --git a/src/views/users.js b/src/views/users.js
index 9f63ba6bd..35583e917 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -567,11 +567,13 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $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
-                $scope.invitation.user.twoFactorAuthenticationEnabled = false;
+                $timeout(function () {
+                    $scope.invitation.reset2FABusy = false;
+                    $scope.invitation.user.twoFactorAuthenticationEnabled = false;
+                }, 3000);
+
                 refreshUsers();
             });
         }