diff --git a/src/views/users.html b/src/views/users.html
index d6e81052b..d64e6f384 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -354,7 +354,7 @@
         <div class="form-group">
           <label class="control-label">{{ 'users.passwordResetDialog.descriptionEmail' | tr }}</label>
           <div class="input-group">
-            <input type="email" class="form-control" ng-value="passwordReset.email"/>
+            <input type="email" class="form-control" ng-model="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>
@@ -388,7 +388,7 @@
         <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"/>
+            <input type="email" class="form-control" ng-model="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>
diff --git a/src/views/users.js b/src/views/users.js
index 358e35a1a..02ddc6c00 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -546,6 +546,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         email: '',
 
         show: function (user) {
+            $scope.passwordReset.busy = false;
+            $scope.passwordReset.resetLink = '';
             $scope.passwordReset.user = user;
             $scope.passwordReset.email = user.fallbackEmail || user.email;
 
@@ -578,13 +580,15 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         email: '',
 
         show: function (user) {
+            $scope.invitation.busy = false;
+            $scope.invitation.inviteLink = '';
             $scope.invitation.user = user;
-            $scope.invitation.email = user.fallbackEmail || user.email;
+            $scope.invitation.email = user.email;
 
             Client.getInviteLink(user.id, function (error, result) {
                 if (error) return console.error('Failed to get invite link.', error);
 
-                $scope.invitation.resetLink = result.inviteLink;
+                $scope.invitation.inviteLink = result.inviteLink;
 
                 $('#invitationModal').modal('show');
             });