diff --git a/src/js/client.js b/src/js/client.js
index 34664b85b..630b68b2e 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1535,15 +1535,6 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         return appFound;
     };
 
-    Client.prototype.sendInvite = function (userId, callback) {
-        post('/api/v1/users/' + userId + '/send_invite', {}, null, function (error, data, status) {
-            if (error) return callback(error);
-            if (status !== 200) return callback(new ClientError(status, data));
-
-            callback(null, data);
-        });
-    };
-
     Client.prototype.disableTwoFactorAuthenticationByUserId = function (userId, callback) {
         post('/api/v1/users/' + userId + '/twofactorauthentication_disable', {}, null, function (error, data, status) {
             if (error) return callback(error);
@@ -1891,6 +1882,24 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.getInviteLink = function (userId, callback) {
+        get('/api/v1/users/' + userId + '/invite_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.sendInviteEmail = function (userId, email, callback) {
+        post('/api/v1/users/' + userId + '/send_invite_email', { email }, null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 202) return callback(new ClientError(status, data));
+
+            callback(null, data);
+        });
+    };
+
     Client.prototype.setTwoFactorAuthenticationSecret = function (callback) {
         var data = {};
 
diff --git a/src/views/users.html b/src/views/users.html
index e9d1bf734..d6e81052b 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -346,7 +346,7 @@
           <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>
+              <button class="btn btn-primary" type="button" data-clipboard-target="#passwordResetLinkInput"><i class="fa fa-clipboard"></i></button>
             </span>
           </div>
         </div>
@@ -354,7 +354,7 @@
         <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"/>
+            <input type="email" 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>
@@ -375,24 +375,28 @@
       <div class="modal-header">
         <h4 class="modal-title">{{ 'users.invitationDialog.title' | tr:{ username: (invitation.user.username || invitation.user.email) } }}</h4>
       </div>
-      <div class="modal-body">
-        <div ng-hide="invitation.inviteLink">
-          <p>{{ 'users.invitationDialog.inviteLinkExplanation' | tr }}</p>
-        </div>
-        <div ng-show="invitation.inviteLink">
-          <p>{{ 'users.invitationDialog.description' | tr:{ email: invitation.user.fallbackEmail } }}</p>
-          <div class="input-group" style="margin-bottom: 10px">
+      <div class="modal-body"><div class="form-group">
+          <label class="control-label">{{ 'users.invitationDialog.descriptionLink' | tr }}</label>
+          <div class="input-group">
             <input type="text" id="invitationLinkInput" class="form-control" ng-value="invitation.inviteLink" readonly/>
             <span class="input-group-btn">
-              <button class="btn btn-default" id="setupLinkButton" type="button" data-clipboard-target="#invitationLinkInput"><i class="fa fa-clipboard"></i></button>
+              <button class="btn btn-primary" type="button" data-clipboard-target="#invitationLinkInput"><i class="fa fa-clipboard"></i></button>
+            </span>
+          </div>
+        </div>
+        <br/>
+        <div class="form-group">
+          <label class="control-label">{{ 'users.invitationDialog.descriptionEmail' | tr }}</label>
+          <div class="input-group">
+            <input type="email" class="form-control" ng-value="invitation.email"/>
+            <span class="input-group-btn">
+              <button type="button" class="btn btn-primary" ng-click="invitation.sendEmail()" ng-disabled="invitation.busy"><i class="fa fa-circle-notch fa-spin" ng-show="invitation.busy"></i> {{ 'users.invitationDialog.sendAction' | tr }}</button>
             </span>
           </div>
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal" ng-hide="invitation.inviteLink">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="invitation.inviteLink">{{ 'main.dialog.close' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="invitation.submit()" ng-hide="invitation.inviteLink" ng-disabled="invitation.busy"><i class="fa fa-circle-notch fa-spin" ng-show="invitation.busy"></i> {{ 'users.invitationDialog.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 0daffa99a..358e35a1a 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -215,7 +215,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
                     if (error) return console.error(error);
 
-                    if ($scope.useradd.sendInvite) Client.sendInvite(userId, function (error) { if (error) console.error('Failed to send invite.', error); });
+                    if ($scope.useradd.sendInvite) Client.sendInviteEmail(userId, user.email, function (error) { if (error) console.error('Failed to send invite.', error); });
 
                     refresh();
                     refreshAllUsers();
@@ -575,24 +575,30 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         busy: false,
         inviteLink: '',
         user: null,
+        email: '',
 
         show: function (user) {
             $scope.invitation.user = user;
-            $scope.invitation.inviteLink = '';
-            $scope.invitation.busy = false;
+            $scope.invitation.email = user.fallbackEmail || user.email;
 
-            $('#invitationModal').modal('show');
+            Client.getInviteLink(user.id, function (error, result) {
+                if (error) return console.error('Failed to get invite link.', error);
+
+                $scope.invitation.resetLink = result.inviteLink;
+
+                $('#invitationModal').modal('show');
+            });
         },
 
-        submit: function () {
+        sendEmail: function () {
             $scope.invitation.busy = true;
 
-            Client.sendInvite($scope.invitation.user.id, function (error, result) {
+            Client.sendInviteEmail($scope.invitation.user.id, $scope.invitation.email, function (error) {
+                if (error) return console.error('Failed to send invite email.', error);
+
                 $scope.invitation.busy = false;
 
-                if (error) return console.error(error);
-
-                $scope.invitation.inviteLink = result.inviteLink;
+                $('#invitationModal').modal('hide');
             });
         }
     };