diff --git a/src/mail_templates/welcome_user.ejs b/src/mail_templates/welcome_user.ejs
index 26308bce7..af8588672 100644
--- a/src/mail_templates/welcome_user.ejs
+++ b/src/mail_templates/welcome_user.ejs
@@ -2,21 +2,33 @@
 
 Hi <%= user.displayName || user.username || user.alternateEmail || user.email %>,
 
-Welcome to our Cloudron <%= fqdn %>!
+Welcome to <%= cloudronName %>!
 
-Cloudron is a platform to run apps on your server. You can read more about it at https://www.cloudron.io.
-
-To get started, create your account by visiting the following page:
+To get started, activate your account by visiting the following page:
 <%= setupLink %>
 
 <% if (invitor && invitor.email) { %>
-Thank you,
-<%= invitor.email %>
-<% } else { %>
-Thank you
+Your <%= invitor.email %>
 <% } %>
 
 <% } else { %>
 
-<% } %>
+<center>
 
+<h3>Hi <%= user.displayName || user.username || user.alternateEmail || user.email %>,</h3>
+
+<img src="<%= cloudronAvatarUrl %>"/>
+<h1>Welcome to <%= cloudronName %>!</h1>
+
+<p>
+    To get started, activate your account by visiting the following page:<br/>
+    <a href="<%= setupLink %>"><%= setupLink %></a>
+</p>
+
+<p>
+    <% if (invitor && invitor.email) { %>
+    Your <%= invitor.email %>
+    <% } %>
+</p>
+
+<% } %>
diff --git a/src/mailer.js b/src/mailer.js
index 6300b3d8d..6f202bf8f 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -39,12 +39,12 @@ var assert = require('assert'),
     dns = require('native-dns'),
     docker = require('./docker.js').connection,
     ejs = require('ejs'),
-    fs = require('fs'),
     ini = require('ini'),
     nodemailer = require('nodemailer'),
     path = require('path'),
     paths = require('./paths.js'),
     safe = require('safetydance'),
+    settings = require('./settings.js'),
     smtpTransport = require('nodemailer-smtp-transport'),
     users = require('./user.js'),
     util = require('util'),
@@ -243,23 +243,32 @@ function sendInvite(user, invitor) {
 
     debug('Sending invite mail');
 
-    var templateData = {
-        user: user,
-        webadminUrl: config.adminOrigin(),
-        setupLink: config.adminOrigin() + '/api/v1/session/account/setup.html?reset_token=' + user.resetToken,
-        format: 'text',
-        fqdn: config.fqdn(),
-        invitor: invitor
-    };
+    settings.getCloudronName(function (error, cloudronName) {
+        if (error) {
+            console.error(error);
+            cloudronName = 'Cloudron';
+        }
 
-    var mailOptions = {
-        from: mailConfig().from,
-        to: user.alternateEmail || user.email,
-        subject: util.format('Welcome to Cloudron %s', config.fqdn()),
-        text: render('welcome_user.ejs', templateData)
-    };
+        var templateData = {
+            user: user,
+            webadminUrl: config.adminOrigin(),
+            setupLink: config.adminOrigin() + '/api/v1/session/account/setup.html?reset_token=' + user.resetToken,
+            format: 'text',
+            fqdn: config.fqdn(),
+            invitor: invitor,
+            cloudronName: cloudronName,
+            cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
+        };
 
-    enqueue(mailOptions);
+        var mailOptions = {
+            from: mailConfig().from,
+            to: user.alternateEmail || user.email,
+            subject: util.format('Welcome to %s', cloudronName),
+            text: render('welcome_user.ejs', templateData)
+        };
+
+        enqueue(mailOptions);
+    });
 }
 
 function userAdded(user, inviteSent) {