diff --git a/src/mail_templates/welcome_user-html.ejs b/src/mail_templates/welcome_user-html.ejs
index 47bfb18a2..5e3ef0e53 100644
--- a/src/mail_templates/welcome_user-html.ejs
+++ b/src/mail_templates/welcome_user-html.ejs
@@ -2,28 +2,27 @@
 
 <img src="<%= cloudronAvatarUrl %>" width="128px" height="128px"/>
 
-<h3>Hi <%= user.displayName || user.username || user.email %>,</h3>
-
+<h3>{{ welcomeEmail.salutation }}</h3>
 <h2>{{ welcomeEmail.welcomeTo }}</h2>
 
 <p>
-    <a href="<%= inviteLink %>">Get started</a>.
+  <a href="<%= inviteLink %>">{{ welcomeEmail.inviteLinkAction }}</a>
 </p>
 
 <br/>
 <br/>
 
 <div style="font-size: 10px; color: #333333; background: #ffffff;">
-    <% if (invitor && invitor.email) { %>
-        You are receiving this email because you were invited by <%= invitor.email %>.
-    <% } %>
+<% if (invitor) { -%>
+  {{ welcomeEmail.invitor }}
+<% } -%>
 
-    <br/>
+  <br/>
 
-        Please note that the invite link will expire in 7 days.
-    <br/>
+  {{ welcomeEmail.expireNote }}
+  <br/>
 
-    Powered by <a href="https://cloudron.io">Cloudron</a>
+  Powered by <a href="https://cloudron.io">Cloudron</a>
 </div>
 
 </center>
diff --git a/src/mail_templates/welcome_user-text.ejs b/src/mail_templates/welcome_user-text.ejs
index a0f8aa73a..ca18b827c 100644
--- a/src/mail_templates/welcome_user-text.ejs
+++ b/src/mail_templates/welcome_user-text.ejs
@@ -1,14 +1,13 @@
-Dear <%= user.displayName || user.username || user.email %>,
+{{ welcomeEmail.salutation }}
 
-Welcome to <%= cloudronName %>!
+{{ welcomeEmail.welcomeTo }}
 
-Follow the link to get started.
-<%- inviteLink %>
+{{ welcomeEmail.inviteLinkActionText }}
 
-<% if (invitor && invitor.email) { %>
-You are receiving this email because you were invited by <%= invitor.email %>.
+<% if (invitor) { %>
+{{ welcomeEmail.invitor }}
 <% } %>
 
-Please note that the invite link will expire in 7 days.
+{{ welcomeEmail.expireNote }}
 
 Powered by https://cloudron.io
diff --git a/src/mailer.js b/src/mailer.js
index d39a55585..38b508098 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -147,10 +147,10 @@ function sendInvite(user, invitor, inviteLink) {
             if (error) return debug('Error getting translations:', error);
 
             var templateData = {
-                user: user,
+                user: user.displayName || user.username || user.email,
                 webadminUrl: settings.adminOrigin(),
                 inviteLink: inviteLink,
-                invitor: invitor,
+                invitor: invitor ? invitor.email : null,
                 cloudronName: mailConfig.cloudronName,
                 cloudronAvatarUrl: settings.adminOrigin() + '/api/v1/cloudron/avatar'
             };