diff --git a/src/views/users.html b/src/views/users.html
index 114464758..d50fcecdf 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -329,7 +329,6 @@
       <div class="modal-body">
         <div ng-hide="passwordReset.resetLink">
           <p>{{ 'users.passwordResetDialog.resetLinkExplanation' | tr }}</p>
-          <button type="button" class="btn btn-primary" ng-click="passwordReset.submit()" ng-disabled="passwordReset.busy"><i class="fa fa-circle-notch fa-spin" ng-show="passwordReset.busy"></i> {{ 'users.passwordResetDialog.newLinkAction' | tr }}</button>
         </div>
         <div ng-show="passwordReset.resetLink">
           <p>{{ 'users.passwordResetDialog.description' | tr:{ email: passwordReset.user.fallbackEmail } }}</p>
@@ -342,7 +341,9 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal" ng-hide="passwordReset.resetLink">{{ 'main.dialog.cancel' | tr }}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="passwordReset.resetLink">{{ 'main.dialog.close' | tr }}</button>
+        <button type="button" class="btn btn-success" ng-click="passwordReset.submit()" ng-hide="passwordReset.resetLink" ng-disabled="passwordReset.busy"><i class="fa fa-circle-notch fa-spin" ng-show="passwordReset.busy"></i> {{ 'users.passwordResetDialog.newLinkAction' | tr }}</button>
       </div>
     </div>
   </div>
@@ -358,7 +359,6 @@
       <div class="modal-body">
         <div ng-hide="invitation.inviteLink">
           <p>{{ 'users.invitationDialog.inviteLinkExplanation' | tr }}</p>
-          <button type="button" class="btn btn-primary" ng-click="invitation.submit()" ng-disabled="invitation.busy"><i class="fa fa-circle-notch fa-spin" ng-show="invitation.busy"></i> {{ 'users.invitationDialog.newLinkAction' | tr }}</button>
         </div>
         <div ng-show="invitation.inviteLink">
           <p>{{ 'users.invitationDialog.description' | tr:{ email: invitation.user.fallbackEmail } }}</p>
@@ -371,7 +371,9 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
+        <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>
       </div>
     </div>
   </div>