diff --git a/src/js/client.js b/src/js/client.js
index 10bb67dc3..06b4a046a 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1183,7 +1183,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
 
-            callback(null, data.resetToken);
+            callback(null, data);
         });
     };
 
diff --git a/src/views/users.js b/src/views/users.js
index d72b2e749..c5bf7d915 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -411,10 +411,10 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.invitation.setupLink = '';
             $scope.invitation.busy = false;
 
-            Client.createInvite(user.id, function (error, resetToken) {
+            Client.createInvite(user.id, function (error, result) {
                 if (error) return console.error(error);
 
-                $scope.invitation.setupLink = location.origin + '/api/v1/session/account/setup.html?reset_token=' + resetToken + '&email=' + encodeURIComponent($scope.invitation.user.email);
+                $scope.invitation.setupLink = result.inviteLink;
 
                 $('#invitationModal').modal('show');
             });