diff --git a/lib/extensions/index.js b/lib/extensions/index.js
index 0e27f6e..f454e0c 100644
--- a/lib/extensions/index.js
+++ b/lib/extensions/index.js
@@ -215,17 +215,23 @@ function sendMail(state, auth) {
       -F subject='Hello' \
       -F text='Testing some Mailgun awesomeness!'
   */
-  var subj = 'Confirm New Device Connection';
-  var text = "You tried connecting with '{{hostname}}' for the first time. Confirm to continue connecting:\n"
+  var subj = "Confirm New Device for Your Telebit Account";
+  var text = "Hello!\n"
+        + '\n'
+        + "Want to use '{{hostname}}' with Telebit?\n"
+        + "Just confirm your email address by clicking the link below:\n"
         + '\n'
         + '    https://' + state.config.webminDomain + '/login/#/magic={{secret}}\n'
         + '\n'
         + "({{os_arch}} {{os_platform}} {{os_release}})\n"
         + '\n'
         ;
-  var html = "You tried connecting with '{{hostname}}' for the first time. Confirm to continue connecting:<br>"
+  var html = "<h3>Hello!</h3>"
         + '<br>'
-        + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    <a href="https://' + state.config.webminDomain + '/login/#/magic={{secret}}">Confirm Device</a><br>'
+        + "Want to use '{{hostname}}' with Telebit?<br>"
+        + "Just confirm your email address by clicking the link below:<br>"
+        + '<br>'
+        + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    <a href="https://' + state.config.webminDomain + '/login/#/magic={{secret}}">Confirm Email Address</a><br>'
         + '<br>'
         + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    <small>or copy and paste this link:</small><br>'
         + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    <small>https://' + state.config.webminDomain + '/login/#/magic={{secret}}</small><br>'