diff --git a/src/mailer.js b/src/mailer.js
index 90b1547c0..fbdc7dce3 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -137,7 +137,7 @@ function sendInvite(user, invitor) {
         var templateData = {
             user: user,
             webadminUrl: settings.adminOrigin(),
-            setupLink: `${settings.adminOrigin()}/api/v1/session/account/setup.html?reset_token=${user.resetToken}&email=${encodeURIComponent(user.email)}`,
+            setupLink: `${settings.adminOrigin()}/setupaccount.html?resetToken=${user.resetToken}&email=${encodeURIComponent(user.email)}` + (user.username ? `&username=${user.username}` : ''),
             invitor: invitor,
             cloudronName: mailConfig.cloudronName,
             cloudronAvatarUrl: settings.adminOrigin() + '/api/v1/cloudron/avatar'