diff --git a/src/mail_templates/user_added.ejs b/src/mail_templates/user_added.ejs
index e37e4b52f..8deaed639 100644
--- a/src/mail_templates/user_added.ejs
+++ b/src/mail_templates/user_added.ejs
@@ -2,7 +2,7 @@
 
 Dear Admin,
 
-User with name '<%= username %>' (<%= email %>) was added in the Cloudron at <%= fqdn %>.
+User with name <%= user.email %> was added in the Cloudron at <%= fqdn %>.
 
 You are receiving this email because you are an Admin of the Cloudron at <%= fqdn %>.
 
diff --git a/src/mail_templates/welcome_user.ejs b/src/mail_templates/welcome_user.ejs
index ed82e2fad..7ea9d3367 100644
--- a/src/mail_templates/welcome_user.ejs
+++ b/src/mail_templates/welcome_user.ejs
@@ -1,14 +1,12 @@
 <%if (format === 'text') { %>
 
-Dear <%= user.username %>,
+Dear <%= user.email %>,
 
 Welcome to our Cloudron <%= fqdn %>!
 
 The Cloudron is our own Smart Server. You can read more about it
 at https://www.cloudron.io.
 
-           You username is '<%= user.username %>'
-
 To get started, create your account by visiting the following page:
 <%= setupLink %>
 
diff --git a/src/mailer.js b/src/mailer.js
index 94b442bf0..eb2cf9dbc 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -268,8 +268,8 @@ function userAdded(user, inviteSent) {
         var mailOptions = {
             from: config.adminEmail(),
             to: adminEmails.join(', '),
-            subject: util.format('%s added in Cloudron %s', user.username, config.fqdn()),
-            text: render('user_added.ejs', { fqdn: config.fqdn(), username: user.username, email: user.email, inviteLink: inviteLink, format: 'text' }),
+            subject: util.format('%s added in Cloudron %s', user.email, config.fqdn()),
+            text: render('user_added.ejs', { fqdn: config.fqdn(), user: user, inviteLink: inviteLink, format: 'text' }),
         };
 
         enqueue(mailOptions);