diff --git a/src/views/users.html b/src/views/users.html
index 8245e1fd0..5e9fefc36 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -337,7 +337,8 @@
               <button class="btn btn-default" id="setupLinkButton" type="button" data-clipboard-target="#setupLinkInput"><i class="fa fa-clipboard"></i></button>
             </span>
           </div>
-          <button type="button" class="btn btn-primary" ng-click="invitation.email()" ng-disabled="invitation.busySend"><i class="fa fa-circle-notch fa-spin" ng-show="invitation.busySend"></i> {{ 'users.passwordResetDialog.sendEmailLinkAction' | tr }}</button>
+          <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">Sent</b>
         </div>
         <hr/>
         <div>
diff --git a/src/views/users.js b/src/views/users.js
index 9452d69c0..9f63ba6bd 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -528,12 +528,14 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         reset2FABusy: false,
         setupLink: '',
         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;
 
             $('#invitationModal').modal('show');
         },
@@ -554,6 +556,10 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             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);
             });
         },
 
@@ -565,6 +571,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 if (error) return console.error(error);
 
                 // ensure to update changed user state
+                $scope.invitation.user.twoFactorAuthenticationEnabled = false;
                 refreshUsers();
             });
         }