diff --git a/src/mail_templates/welcome_user.ejs b/src/mail_templates/welcome_user.ejs
index bde9325a7..26308bce7 100644
--- a/src/mail_templates/welcome_user.ejs
+++ b/src/mail_templates/welcome_user.ejs
@@ -1,6 +1,6 @@
 <%if (format === 'text') { %>
 
-Hi<%= ' ' + user.displayName %>,
+Hi <%= user.displayName || user.username || user.alternateEmail || user.email %>,
 
 Welcome to our Cloudron <%= fqdn %>!