From bc78f4a6d8c7bb2eaaedcb9a58f493019d00a7e6 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Sat, 7 May 2016 01:18:40 -0700
Subject: [PATCH] fix user to match adminEmail

---
 src/addons.js | 2 +-
 src/mailer.js | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/addons.js b/src/addons.js
index f2df51891..05b52f673 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -401,7 +401,7 @@ function setupSendMail(app, options, callback) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var from = app.location ? app.location + '-app' : app.manifest.title.replace(/[^a-zA-Z0-9]/, ''); // use no-reply for bare domains
+    var from = (app.location ? app.location : app.manifest.title.replace(/[^a-zA-Z0-9]/, '')) + '-app';
 
     var env = [
         'MAIL_SMTP_SERVER=mail',
diff --git a/src/mailer.js b/src/mailer.js
index 7c382f2fc..91849da46 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -160,9 +160,8 @@ function sendMails(queue) {
         var transport = nodemailer.createTransport(smtpTransport({
             host: mailServerIp,
             port: 2500, // this value comes from mail container
-            requireTLS: true, // STARTTLS
             auth: {
-                user: 'webadmin',
+                user: 'no-reply', // derive from adminEmail
                 pass: 'supersecret'
             },
             tls: {