diff --git a/src/mail_templates/user_added.ejs b/src/mail_templates/user_added.ejs
index f5bbf3e48..46917131b 100644
--- a/src/mail_templates/user_added.ejs
+++ b/src/mail_templates/user_added.ejs
@@ -2,9 +2,7 @@
 
 Dear Admin,
 
-User with email <%= user.alternateEmail || user.email %> was added in the Cloudron at <%= fqdn %>.
-
-You are receiving this email because you are an Admin of the Cloudron at <%= fqdn %>.
+User with email <%= user.alternateEmail || user.email %> was added to your <%= cloudronName %> Cloudron.
 
 <% if (inviteLink) { %>
 As requested, this user has not been sent an invitation email.
@@ -14,9 +12,6 @@ To set a password and perform any configuration on behalf of the user, please us
 
 <% } %>
 
-Thank you,
-User Manager
-
 <% } else { %>
 
 <% } %>
diff --git a/src/mail_templates/welcome_user.ejs b/src/mail_templates/welcome_user.ejs
index af8588672..b2c44049c 100644
--- a/src/mail_templates/welcome_user.ejs
+++ b/src/mail_templates/welcome_user.ejs
@@ -15,20 +15,17 @@ Your <%= invitor.email %>
 
 <center>
 
+<img src="<%= cloudronAvatarUrl %>"/>
+
 <h3>Hi <%= user.displayName || user.username || user.alternateEmail || user.email %>,</h3>
 
-<img src="<%= cloudronAvatarUrl %>"/>
-<h1>Welcome to <%= cloudronName %>!</h1>
+<h2>Welcome to <%= cloudronName %>!</h2>
 
 <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 %>
-    <% } %>
+<% if (invitor && invitor.email) { %>
+    You got invited by <%= invitor.email %>.<br/>
+<% } %>
+    To get started, <a href="<%= setupLink %>">activate your account</a>.
 </p>
 
 <% } %>