diff --git a/src/js/client.js b/src/js/client.js
index acdea3401..34664b85b 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1873,8 +1873,17 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.sendPasswordReset = function (identifier, callback) {
-        post('/api/v1/cloudron/password_reset_request', { identifier }, null, function (error, data, status) {
+    Client.prototype.getPasswordResetLink = function (userId, callback) {
+        get('/api/v1/users/' + userId + '/password_reset_link', null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null, data);
+        });
+    };
+
+    Client.prototype.sendPasswordResetEmail = function (userId, email, callback) {
+        post('/api/v1/users/' + userId + '/send_password_reset_email', { email }, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 202) return callback(new ClientError(status, data));
 
diff --git a/src/translation/en.json b/src/translation/en.json
index 892cb2450..b3d40dbd9 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -285,7 +285,10 @@
             "2FAIsSetup": "Use this to disable user's 2FA. The user can set it up again from the Profile view.",
             "newLinkAction": "Email reset link",
             "resetLinkExplanation": "Use this to email a password reset link to the user's fallback email address - {{ email }}.",
-            "reset2FAAction": "Reset 2FA"
+            "reset2FAAction": "Reset 2FA",
+            "sendAction": "Send",
+            "descriptionLink": "Password reset link for forwarding to the user",
+            "descriptionEmail": "Send password reset link to"
         },
         "externalLdapDialog": {
             "title": "Configure LDAP"
diff --git a/src/views/users.html b/src/views/users.html
index b6209c338..1833f0a6a 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -341,23 +341,32 @@
         <h4 class="modal-title">{{ 'users.passwordResetDialog.title' | tr:{ username: (passwordReset.user.username || passwordReset.user.email) } }}</h4>
       </div>
       <div class="modal-body">
-        <div ng-hide="passwordReset.resetLink">
-          <p>{{ 'users.passwordResetDialog.resetLinkExplanation' | tr: { email: passwordReset.user.fallbackEmail } }}</p>
+        <div>
+          <div class="form-group">
+            <label class="control-label">{{ 'users.passwordResetDialog.descriptionLink' | tr }}</label>
+            <div class="input-group">
+              <input type="text" id="passwordResetLinkInput" class="form-control" ng-value="passwordReset.resetLink" readonly/>
+              <span class="input-group-btn">
+                <button class="btn btn-primary" id="setupLinkButton" type="button" data-clipboard-target="#passwordResetLinkInput"><i class="fa fa-clipboard"></i></button>
+              </span>
+            </div>
+          </div>
         </div>
-        <div ng-show="passwordReset.resetLink">
-          <p>{{ 'users.passwordResetDialog.description' | tr:{ email: passwordReset.user.fallbackEmail } }}</p>
-          <div class="input-group" style="margin-bottom: 10px">
-            <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="#passwordResetLinkInput"><i class="fa fa-clipboard"></i></button>
-            </span>
+        <br/>
+        <div>
+          <div class="form-group">
+            <label class="control-label">{{ 'users.passwordResetDialog.descriptionEmail' | tr }}</label>
+            <div class="input-group">
+              <input type="email" id="passwordResetEmailInput" class="form-control" ng-value="passwordReset.email"/>
+              <span class="input-group-btn">
+                <button type="button" class="btn btn-primary" ng-click="passwordReset.sendEmail()" ng-disabled="passwordReset.busy"><i class="fa fa-circle-notch fa-spin" ng-show="passwordReset.busy"></i> {{ 'users.passwordResetDialog.sendAction' | tr }}</button>
+              </span>
+            </div>
           </div>
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal" ng-hide="passwordReset.resetLink">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="passwordReset.resetLink">{{ 'main.dialog.close' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="passwordReset.submit()" ng-hide="passwordReset.resetLink" ng-disabled="passwordReset.busy"><i class="fa fa-circle-notch fa-spin" ng-show="passwordReset.busy"></i> {{ 'users.passwordResetDialog.newLinkAction' | tr }}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
       </div>
     </div>
   </div>
diff --git a/src/views/users.js b/src/views/users.js
index f74449ea2..0daffa99a 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -543,24 +543,30 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         busy: false,
         resetLink: '',
         user: null,
+        email: '',
 
         show: function (user) {
             $scope.passwordReset.user = user;
-            $scope.passwordReset.resetLink = '';
-            $scope.passwordReset.busy = false;
+            $scope.passwordReset.email = user.fallbackEmail || user.email;
 
-            $('#passwordResetModal').modal('show');
+            Client.getPasswordResetLink(user.id, function (error, result) {
+                if (error) return console.error('Failed to get password reset link.', error);
+
+                $scope.passwordReset.resetLink = result.passwordResetLink;
+
+                $('#passwordResetModal').modal('show');
+            });
         },
 
-        submit: function () {
+        sendEmail: function () {
             $scope.passwordReset.busy = true;
 
-            Client.sendPasswordReset($scope.passwordReset.user.email, function (error, result) {
+            Client.sendPasswordResetEmail($scope.passwordReset.user.id, $scope.passwordReset.email, function (error) {
+                if (error) return console.error('Failed to send password reset email.', error);
+
                 $scope.passwordReset.busy = false;
 
-                if (error) return console.error(error);
-
-                $scope.passwordReset.resetLink = result.resetLink;
+                $('#passwordResetModal').modal('hide');
             });
         }
     };