diff --git a/src/mail_templates/user_added.ejs b/src/mail_templates/user_added.ejs
index 46917131b..d4af34378 100644
--- a/src/mail_templates/user_added.ejs
+++ b/src/mail_templates/user_added.ejs
@@ -1,6 +1,6 @@
 <%if (format === 'text') { %>
 
-Dear Admin,
+Hi <%= cloudronName %> Admin,
 
 User with email <%= user.alternateEmail || user.email %> was added to your <%= cloudronName %> Cloudron.
 
diff --git a/src/mail_templates/welcome_user.ejs b/src/mail_templates/welcome_user.ejs
index b2c44049c..7654948fe 100644
--- a/src/mail_templates/welcome_user.ejs
+++ b/src/mail_templates/welcome_user.ejs
@@ -15,7 +15,7 @@ Your <%= invitor.email %>
 
 <center>
 
-<img src="<%= cloudronAvatarUrl %>"/>
+<img src="<%= cloudronAvatarUrl %>" width="128px" height="128px"/>
 
 <h3>Hi <%= user.displayName || user.username || user.alternateEmail || user.email %>,</h3>
 
diff --git a/src/mailer.js b/src/mailer.js
index bbf052690..1aeb4a861 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -286,16 +286,29 @@ function userAdded(user, inviteSent) {
 
         adminEmails = _.difference(adminEmails, [ user.email ]);
 
-        var inviteLink = inviteSent ? null : config.adminOrigin() + '/api/v1/session/account/setup.html?reset_token=' + user.resetToken;
+        settings.getCloudronName(function (error, cloudronName) {
+            if (error) {
+                console.error(error);
+                cloudronName = 'Cloudron';
+            }
 
-        var mailOptions = {
-            from: mailConfig().from,
-            to: adminEmails.join(', '),
-            subject: util.format('%s added in Cloudron %s', user.alternateEmail || user.email, config.fqdn()),
-            text: render('user_added.ejs', { fqdn: config.fqdn(), user: user, inviteLink: inviteLink, format: 'text' }),
-        };
+            var templateData = {
+                fqdn: config.fqdn(),
+                user: user,
+                inviteLink: inviteSent ? null : config.adminOrigin() + '/api/v1/session/account/setup.html?reset_token=' + user.resetToken,
+                format: 'text',
+                cloudronName: cloudronName
+            };
 
-        enqueue(mailOptions);
+            var mailOptions = {
+                from: mailConfig().from,
+                to: adminEmails.join(', '),
+                subject: util.format('%s: user %s added', cloudronName, user.alternateEmail || user.email),
+                text: render('user_added.ejs', templateData)
+            };
+
+            enqueue(mailOptions);
+        });
     });
 }