diff --git a/src/js/client.js b/src/js/client.js
index 4ec6697df..c0b2a4f1a 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -774,13 +774,20 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         };
     };
 
-    Client.prototype.sendInvite = function (user, callback) {
-        post('/api/v1/users/' + user.id + '/invite').success(function (data, status) {
+    Client.prototype.createInvite = function (userId, callback) {
+        post('/api/v1/users/' + userId + '/create_invite').success(function (data, status) {
             if (status !== 200) return callback(new ClientError(status, data));
             callback(null, data.resetToken);
         }).error(defaultErrorHandler(callback));
     };
 
+    Client.prototype.sendInvite = function (userId, callback) {
+        post('/api/v1/users/' + userId + '/send_invite').success(function (data, status) {
+            if (status !== 200) return callback(new ClientError(status, data));
+            callback(null);
+        }).error(defaultErrorHandler(callback));
+    };
+
     Client.prototype.setupDnsConfig = function (domain, zoneName, provider, dnsConfig, tlsConfig, callback) {
         var data = {
             domain: domain,
@@ -964,7 +971,6 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         var data = {
             email: user.email,
             displayName: user.displayName,
-            invite: !!user.sendInvite,
             admin: user.admin
         };
 
diff --git a/src/js/index.js b/src/js/index.js
index abb8aa7ed..c8d95613f 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -34,6 +34,22 @@ function asyncForEach(items, handler, callback) {
     })();
 }
 
+function asyncSeries(funcs, callback) {
+    var cur = 0;
+
+    if (funcs.length === 0) return callback();
+
+    (function iterator() {
+        funcs[cur](function (error) {
+            if (error) return callback(error);
+            if (cur >= funcs.length-1) return callback();
+            ++cur;
+
+            iterator();
+        });
+    })();
+}
+
 // create main application module
 var app = angular.module('Application', ['ngFitText', 'ngRoute', 'ngAnimate', 'ngSanitize', 'angular-md5', 'base64', 'slick', 'ui-notification', 'ui.bootstrap', 'ui.bootstrap-slider', 'ngTld', 'ui.multiselect']);
 
diff --git a/src/views/users.html b/src/views/users.html
index 78244fa06..88347f284 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -258,25 +258,26 @@
     </div>
 </div>
 
-<!-- Modal invite sent -->
-<div class="modal fade" id="inviteSentModal" tabindex="-1" role="dialog">
+<!-- Modal invite -->
+<div class="modal fade" id="invitationModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">Invite Sent</h4>
+                <h4 class="modal-title">Invite User {{user.username || user.email}}</h4>
             </div>
             <div class="modal-body">
-                <p>An email has been sent to <b>{{ inviteSent.email }}</b>.</p>
-                <p>You can also share this invite link directly:</p>
+                <p>Use the link below to setup {{ user.username || user.email }}'s account or reset their password:</p>
                 <div class="input-group">
-                    <input type="text" id="setupLinkInput" class="form-control" ng-value="inviteSent.setupLink" readonly/>
+                    <input type="text" id="setupLinkInput" class="form-control" ng-value="invitation.setupLink" 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>
                     </span>
                   </div>
+                  <br/>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">OK</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-success" ng-click="invitation.email()" ng-disabled="invitation.busy"><i class="fa fa-circle-o-notch fa-spin" ng-show="invitation.busy"></i> Email link to user</button>
             </div>
         </div>
     </div>
@@ -330,7 +331,7 @@
                               </td>
 
                               <td class="text-right no-wrap" style="vertical-align: bottom">
-                                  <button ng-show="!isMe(user)" class="btn btn-xs btn-default" ng-click="sendInvite(user)" title="Send invitation email"><i class="fa fa-paper-plane-o"></i></button>
+                                  <button ng-show="!isMe(user)" class="btn btn-xs btn-default" ng-click="invitation.show(user)" title="Send invitation email"><i class="fa fa-paper-plane-o"></i></button>
                                   <button class="btn btn-xs btn-default" ng-click="useredit.show(user)" title="Edit User"><i class="fa fa-pencil"></i></button>
                                   <button ng-show="!isMe(user)" class="btn btn-xs btn-danger" ng-click="userremove.show(user)" title="Remove User"><i class="fa fa-trash-o"></i></button>
                               </td>
diff --git a/src/views/users.js b/src/views/users.js
index 56aaf8ae7..a38079315 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -3,6 +3,7 @@
 /* global angular:false */
 /* global Clipboard:false */
 /* global asyncForEach:false */
+/* global asyncSeries:false */
 
 angular.module('Application').controller('UsersController', ['$scope', '$location', '$timeout', 'Client', function ($scope, $location, $timeout, Client) {
     Client.onReady(function () { if (!Client.getUserInfo().admin) $location.path('/'); });
@@ -109,7 +110,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 username: $scope.useradd.username || null,
                 email: $scope.useradd.email,
                 displayName: $scope.useradd.displayName,
-                sendInvite: $scope.useradd.sendInvite,
                 admin: $scope.useradd.admin
             };
 
@@ -151,11 +151,16 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 }
 
                 var groupIds = $scope.useradd.selectedGroups.map(function (g) { return g.id; });
+                var NOOP = function (next) { next(); };
 
-                Client.setGroups(newUserInfo.id, groupIds, function (error) {
+                asyncSeries([
+                    Client.setGroups.bind(Client, newUserInfo.id, groupIds),
+                    $scope.useradd.sendInvite ? Client.createInvite.bind(Client, newUserInfo.id) : NOOP,
+                    $scope.useradd.sendInvite ? Client.sendInvite.bind(Client, newUserInfo.id) : NOOP
+                ], function (error) {
                     $scope.useradd.busy = false;
 
-                    if (error) return console.error('Unable to update groups for user:', error);
+                    if (error) return console.error(error);
 
                     refresh();
 
@@ -347,11 +352,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         }
     };
 
-    $scope.inviteSent = {
-        email: '',
-        setupLink: ''
-    };
-
     $scope.groupRemove = {
         busy: false,
         error: {},
@@ -405,18 +405,34 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         return user.username === Client.getUserInfo().username;
     };
 
-    $scope.sendInvite = function (user) {
-        $scope.inviteSent.email = user.fallbackEmail;
-        $scope.inviteSent.setupLink = '';
+    $scope.invitation = {
+        busy: false,
+        setupLink: '',
+        user: null,
 
-        Client.sendInvite(user, function (error, resetToken) {
-            if (error) return console.error(error);
+        show: function (user) {
+            $scope.invitation.user = user;
+            $scope.invitation.setupLink = '';
+            $scope.invitation.busy = false;
 
-            // Client.notify('', 'Invitation was successfully sent to ' + user.email + '.', false, 'success');
+            Client.createInvite(user.id, function (error, resetToken) {
+                if (error) return console.error(error);
 
-            $scope.inviteSent.setupLink = location.origin + '/api/v1/session/account/setup.html?reset_token=' + resetToken + '&email=' + encodeURIComponent(user.email);
-            $('#inviteSentModal').modal('show');
-        });
+                $scope.invitation.setupLink = location.origin + '/api/v1/session/account/setup.html?reset_token=' + resetToken + '&email=' + encodeURIComponent($scope.invitation.user.email);
+
+                $('#invitationModal').modal('show');
+            });
+        },
+
+        email: function () {
+            $scope.invitation.busy = true;
+
+            Client.sendInvite($scope.invitation.user.id, function (error) {
+                $scope.invitation.busy = false;
+                if (error) return console.error(error);
+                $('#invitationModal').modal('hide');
+            });
+        }
     };
 
     $scope.copyToClipboard = function (/*value*/) {