diff --git a/src/translation/en.json b/src/translation/en.json
index f6a6e76af..e047799ab 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -240,7 +240,8 @@
             "primaryEmail": "Primary email",
             "recoveryEmail": "Password recovery email",
             "errorDisplayNameRequired": "Name is required",
-            "activeCheckbox": "User is active"
+            "activeCheckbox": "User is active",
+            "passwordPlaceholder": "Optional. If provided, the admin can perform pre-setup tasks for the user."
         },
         "deleteUserDialog": {
             "title": "Delete user {{ username }}",
diff --git a/src/views/users.html b/src/views/users.html
index d6313680c..c1483b55f 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -217,6 +217,7 @@
         </form>
       </div>
       <div class="modal-footer">
+        <button type="button" class="btn btn-danger pull-left" ng-click="useredit.reset2FA()" uib-tooltip="{{ (useredit.userInfo.twoFactorAuthenticationEnabled ? 'users.passwordResetDialog.2FAIsSetup' : 'users.passwordResetDialog.no2FASetup') | tr }}" ng-disabled="!useredit.userInfo.twoFactorAuthenticationEnabled || useredit.reset2FABusy"><i class="fa fa-circle-notch fa-spin" ng-show="useredit.reset2FABusy"></i> {{ 'users.passwordResetDialog.reset2FAAction' | 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="useredit.submit()" ng-disabled="useredit_form.$invalid || useredit.busy"><i class="fa fa-circle-notch fa-spin" ng-show="useredit.busy"></i> {{ 'main.dialog.save' | tr }}</button>
       </div>
@@ -529,7 +530,7 @@
 
                   <td class="text-right no-wrap" style="vertical-align: bottom">
                     <button ng-show="isMe(user) && userInfo.role === 'owner' && user.role === 'owner' && !config.features.userRoles" class="btn btn-xs btn-default" ng-click="transferOwnership.show()" uib-tooltip="{{ 'users.users.transferOwnershipTooltip' | tr }}"><i class="fas fa-random"></i></button>
-                    <button ng-disabled="!canEdit(user) || isMe(user) || user.source" class="btn btn-xs btn-default" ng-click="invitation.show(user)" uib-tooltip="{{ 'users.users.resetPasswordTooltip' | tr }}"><i class="fa fa-redo"></i></button>
+                    <button ng-disabled="!canEdit(user) || isMe(user) || user.source" class="btn btn-xs btn-default" ng-click="invitation.show(user)" uib-tooltip="{{ 'users.users.resetPasswordTooltip' | tr }}"><i class="fas fa-paper-plane"></i></button>
                     <button ng-disabled="!canEdit(user)" class="btn btn-xs btn-default" ng-click="useredit.show(user)" uib-tooltip="{{ 'users.users.editUserTooltip' | tr }}"><i class="fa fa-pencil-alt"></i></button>
                     <button ng-disabled="!canEdit(user) || isMe(user)" class="btn btn-xs btn-danger" ng-click="userremove.show(user)" uib-tooltip="{{ 'users.users.removeUserTooltip' | tr }}"><i class="far fa-trash-alt"></i></button>
                   </td>
diff --git a/src/views/users.js b/src/views/users.js
index 443d0a19b..cee854285 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -228,6 +228,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
     $scope.useredit = {
         busy: false,
+        reset2FABusy: false,
         error: {},
         userInfo: {},
 
@@ -308,6 +309,17 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                     $('#userEditModal').modal('hide');
                 });
             });
+        },
+
+        reset2FA: function () {
+            $scope.useredit.reset2FABusy = true;
+
+            Client.disableTwoFactorAuthenticationByUserId($scope.useredit.userInfo.id, function (error) {
+                if (error) return console.error(error);
+
+                $scope.useredit.reset2FABusy = false;
+                $scope.useredit.userInfo.twoFactorAuthenticationEnabled = false;
+            });
         }
     };