diff --git a/src/mail_templates/new_login_location-html.ejs b/src/mail_templates/new_login_location-html.ejs
index 8c45b79b5..301f4d906 100644
--- a/src/mail_templates/new_login_location-html.ejs
+++ b/src/mail_templates/new_login_location-html.ejs
@@ -2,12 +2,14 @@
 
 <img src="<%= cloudronAvatarUrl %>" width="128px" height="128px"/>
 
-<h3>Dear <%= user %>,</h3>
+<h3>We've noticed a new login on your Cloudron <%= cloudronName %></h3>
 
-<p>
-  Someone logged into your Cloudron <%= cloudronName %> with this account.<br/>
-  If it was not you, please reset your password and logout from all sessions in the profile view.
-</p>
+<p>Hi <%= user %>,</p>
+
+<p>We noticed a login on your Cloudron account from a new device.</p>
+<p>Browser <%= userAgent %> - <%= city %>, <%= country %></p>
+
+<p>If this was you, you can safely disregard this email. If this wasn't you, you should change your password immediately</p>
 
 <br/>
 <br/>
diff --git a/src/mail_templates/new_login_location-text.ejs b/src/mail_templates/new_login_location-text.ejs
index c4ce3ed69..b9b0578cf 100644
--- a/src/mail_templates/new_login_location-text.ejs
+++ b/src/mail_templates/new_login_location-text.ejs
@@ -1,8 +1,11 @@
-Dear <%= user %>,
+We've noticed a new login on your Cloudron <%= cloudronName %>
 
-someone logged into your Cloudron <%= cloudronName %> with this account.
-If it was not you, please reset your password and logout from all sessions in the profile view.
+Hi <%= user %>,
 
+We noticed a login on your Cloudron account from a new device.
+Browser <%= userAgent %> - <%= city %>, <%= country %>
+
+If this was you, you can safely disregard this email. If this wasn't you, you should change your password immediately
 
 Powered by https://cloudron.io
 
diff --git a/src/mailer.js b/src/mailer.js
index ed8ada497..c1e460052 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -159,6 +159,10 @@ function sendNewLoginLocation(user, ip, userAgent, country, city) {
 
             var templateData = {
                 user: user.displayName || user.username || user.email,
+                ip: ip,
+                userAgent: userAgent,
+                country: country,
+                city: city,
                 cloudronName: mailConfig.cloudronName,
                 cloudronAvatarUrl: settings.adminOrigin() + '/api/v1/cloudron/avatar'
             };