diff --git a/src/js/client.js b/src/js/client.js
index 4845be978..82e7eaba2 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1845,16 +1845,12 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.sendPasswordReset = function (callback) {
-        var data = {
-            identifier: this._userInfo.email
-        };
-
-        post('/api/v1/cloudron/password_reset_request', data, null, function (error, data, status) {
+    Client.prototype.sendPasswordReset = function (identifier, callback) {
+        post('/api/v1/cloudron/password_reset_request', { identifier }, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 202) return callback(new ClientError(status, data));
 
-            callback(null);
+            callback(null, data);
         });
     };
 
diff --git a/src/translation/en.json b/src/translation/en.json
index e047799ab..10ef96271 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -168,7 +168,7 @@
             "inactiveTooltip": "User is inactive",
             "externalLdapTooltip": "From external LDAP directory",
             "notActivatedYetTooltip": "User is not activated yet",
-            "resetPasswordTooltip": "Reset password, disable 2FA or send invite link",
+            "resetPasswordTooltip": "Reset password",
             "editUserTooltip": "Edit User",
             "removeUserTooltip": "Remove User",
             "transferOwnershipTooltip": "Transfer Ownership"
@@ -273,14 +273,14 @@
             "deleteAction": "Delete"
         },
         "passwordResetDialog": {
-            "title": "Password/2FA reset for {{ username }}",
-            "description": "Use the link below to reset {{ username }}'s password or re-invite:",
+            "title": "Reset password for {{ username }}",
+            "description": "The following password reset link was sent to {{ email }}:",
             "sendEmailLinkAction": "Email link to user",
             "emailSent": "Sent",
             "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": "Use this to generate a password reset or invitation link. The new link will invalidate any old link immediately.",
+            "newLinkAction": "Reset password now",
+            "resetLinkExplanation": "Use this to generate a new password reset link. The new link will also be sent to the user's fallback email address.",
             "reset2FAAction": "Reset 2FA"
         },
         "externalLdapDialog": {
diff --git a/src/views/profile.js b/src/views/profile.js
index 85a426779..09e651259 100644
--- a/src/views/profile.js
+++ b/src/views/profile.js
@@ -18,7 +18,7 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
     });
 
     $scope.sendPasswordReset = function () {
-        Client.sendPasswordReset(function (error) {
+        Client.sendPasswordReset($scope.user.email, function (error) {
             if (error) return console.error('Failed to reset password:', error);
 
             Client.notify($translate.instant('profile.passwordResetNotification.title'), $translate.instant('profile.passwordResetNotification.body', { email: $scope.user.fallbackEmail}), false, 'success');
diff --git a/src/views/users.html b/src/views/users.html
index c1483b55f..e96cb3881 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -321,34 +321,26 @@
   </div>
 </div>
 
-<!-- Modal invite/reset -->
-<div class="modal fade" id="invitationModal" tabindex="-1" role="dialog">
+<!-- Modal password reset -->
+<div class="modal fade" id="passwordResetModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.passwordResetDialog.title' | tr:{ username: (invitation.user.username || invitation.user.email) } }}</h4>
+        <h4 class="modal-title">{{ 'users.passwordResetDialog.title' | tr:{ username: (passwordReset.user.username || passwordReset.user.email) } }}</h4>
       </div>
       <div class="modal-body">
-        <div ng-hide="invitation.setupLink">
+        <div ng-hide="passwordReset.resetLink">
           <p>{{ 'users.passwordResetDialog.resetLinkExplanation' | tr }}</p>
-          <button type="button" class="btn btn-primary" ng-click="invitation.generateNewLink()" ng-disabled="invitation.busyNew"><i class="fa fa-circle-notch fa-spin" ng-show="invitation.busyNew"></i> {{ 'users.passwordResetDialog.newLinkAction' | tr }}</button>
+          <button type="button" class="btn btn-primary" ng-click="passwordReset.submit()" ng-disabled="passwordReset.busy"><i class="fa fa-circle-notch fa-spin" ng-show="passwordReset.busy"></i> {{ 'users.passwordResetDialog.newLinkAction' | tr }}</button>
         </div>
-        <div ng-show="invitation.setupLink">
-          <p>{{ 'users.passwordResetDialog.description' | tr:{ username: (invitation.user.username || invitation.user.email) } }}</p>
+        <div ng-show="passwordReset.resetLink">
+          <p>{{ 'users.passwordResetDialog.description' | tr:{ username: (passwordReset.user.username || passwordReset.user.email) } }}</p>
           <div class="input-group" style="margin-bottom: 10px">
-            <input type="text" id="setupLinkInput" class="form-control" ng-value="invitation.setupLink" readonly/>
+            <input type="text" id="passwordResetLinkInput" class="form-control" ng-value="passwordReset.resetLink" readonly/>
             <span class="input-group-btn">
-              <button class="btn btn-default" id="setupLinkButton" type="button" data-clipboard-target="#setupLinkInput"><i class="fa fa-clipboard"></i></button>
+              <button class="btn btn-default" id="setupLinkButton" type="button" data-clipboard-target="#passwordResetLinkInput"><i class="fa fa-clipboard"></i></button>
             </span>
           </div>
-          <button type="button" class="btn btn-success" ng-click="invitation.email()" ng-hide="invitation.successSend" ng-disabled="invitation.busySend"><i class="fa fa-circle-notch fa-spin" ng-show="invitation.busySend"></i> {{ 'users.passwordResetDialog.sendEmailLinkAction' | tr }}</button>
-          <b class="text-success" ng-show="invitation.successSend">{{ 'users.passwordResetDialog.emailSent' | tr }}</b>
-        </div>
-        <hr/>
-        <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-disabled="!invitation.user.twoFactorAuthenticationEnabled || invitation.reset2FABusy"><i class="fa fa-circle-notch fa-spin" ng-show="invitation.reset2FABusy"></i> {{ 'users.passwordResetDialog.reset2FAAction' | tr }}</button>
         </div>
       </div>
       <div class="modal-footer">
@@ -530,7 +522,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="fas fa-paper-plane"></i></button>
+                    <button ng-disabled="!canEdit(user) || isMe(user) || user.source" class="btn btn-xs btn-default" ng-click="passwordReset.show(user)" uib-tooltip="{{ 'users.users.resetPasswordTooltip' | tr }}"><i class="fas fa-key"></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 cee854285..0f7259f6c 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -537,58 +537,28 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         return user.username === Client.getUserInfo().username;
     };
 
-    $scope.invitation = {
+    $scope.passwordReset = {
         busy: false,
-        reset2FABusy: false,
-        setupLink: '',
+        resetLink: '',
         user: null,
-        successSend: false,
 
         show: function (user) {
-            $scope.invitation.user = user;
-            $scope.invitation.setupLink = '';
-            $scope.invitation.busy = false;
-            $scope.invitation.reset2FABusy = false;
-            $scope.invitation.successSend = false;
+            $scope.passwordReset.user = user;
+            $scope.passwordReset.resetLink = '';
+            $scope.passwordReset.busy = false;
 
-            $('#invitationModal').modal('show');
+            $('#passwordResetModal').modal('show');
         },
 
-        generateNewLink: function () {
-            $scope.invitation.busyNew = true;
+        submit: function () {
+            $scope.passwordReset.busy = true;
 
-            Client.createInvite($scope.invitation.user.id, function (error, result) {
-                $scope.invitation.busyNew = false;
-                if (error) return console.error(error);
-                $scope.invitation.setupLink = result.inviteLink;
-            });
-        },
+            Client.sendPasswordReset($scope.passwordReset.user.email, function (error, result) {
+                $scope.passwordReset.busy = false;
 
-        email: function () {
-            $scope.invitation.busySend = true;
-
-            Client.sendInvite($scope.invitation.user.id, function (error) {
-                $scope.invitation.busySend = false;
                 if (error) return console.error(error);
 
-                $scope.invitation.successSend = true;
-
-                $timeout(function () { $scope.invitation.successSend = false; }, 3000);
-            });
-        },
-
-        reset2FA: function () {
-            $scope.invitation.reset2FABusy = true;
-
-            Client.disableTwoFactorAuthenticationByUserId($scope.invitation.user.id, function (error) {
-                if (error) return console.error(error);
-
-                $timeout(function () {
-                    $scope.invitation.reset2FABusy = false;
-                    $scope.invitation.user.twoFactorAuthenticationEnabled = false;
-                }, 3000);
-
-                refreshUsers();
+                $scope.passwordReset.resetLink = result.resetLink;
             });
         }
     };