diff --git a/src/translation/en.json b/src/translation/en.json
index 10ef96271..6c60aae64 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -171,7 +171,8 @@
             "resetPasswordTooltip": "Reset password",
             "editUserTooltip": "Edit User",
             "removeUserTooltip": "Remove User",
-            "transferOwnershipTooltip": "Transfer Ownership"
+            "transferOwnershipTooltip": "Transfer Ownership",
+            "invitationTooltip": "Invite User"
         },
         "groups": {
             "title": "Groups",
@@ -297,6 +298,12 @@
             "description": "This will make the selected user the owner and admin of this Cloudron and remove admin rights to the current owner.",
             "transferAction": "Transfer Ownership",
             "newOwner": "New Owner"
+        },
+        "invitationDialog": {
+            "title": "Invite {{ username }}",
+            "inviteLinkExplanation": "Use this to generate a new invite link. The link will also be sent to the user and will reset the password.",
+            "newLinkAction": "Invite user now",
+            "description": "The following invite link was sent to {{ email }}:"
         }
     },
     "profile": {
diff --git a/src/views/users.html b/src/views/users.html
index b89157565..ae39eac7d 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -334,7 +334,7 @@
           <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:{ username: (passwordReset.user.username || passwordReset.user.email) } }}</p>
+          <p>{{ 'users.passwordResetDialog.description' | tr:{ email: passwordReset.user.fallbackEmail } }}</p>
           <div class="input-group" style="margin-bottom: 10px">
             <input type="text" id="passwordResetLinkInput" class="form-control" ng-value="passwordReset.resetLink" readonly/>
             <span class="input-group-btn">
@@ -363,7 +363,7 @@
           <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:{ username: (invitation.user.username || invitation.user.email) } }}</p>
+          <p>{{ 'users.invitationDialog.description' | tr:{ email: invitation.user.fallbackEmail } }}</p>
           <div class="input-group" style="margin-bottom: 10px">
             <input type="text" id="invitationLinkInput" class="form-control" ng-value="invitation.inviteLink" readonly/>
             <span class="input-group-btn">