1 files changed, 10 insertions, 4 deletions

diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index f5b68640e..317cec706 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -29,15 +29,21 @@ class Emailer {
         }
       }
 
+      let auth
+      if (CONFIG.SMTP.USERNAME && CONFIG.SMTP.PASSWORD) {
+        auth = {
+          user: CONFIG.SMTP.USERNAME,
+          pass: CONFIG.SMTP.PASSWORD
+        }
+      }
+
       this.transporter = createTransport({
         host: CONFIG.SMTP.HOSTNAME,
         port: CONFIG.SMTP.PORT,
         secure: CONFIG.SMTP.TLS,
+        ignoreTLS: isTestInstance(),
         tls,
-        auth: {
-          user: CONFIG.SMTP.USERNAME,
-          pass: CONFIG.SMTP.PASSWORD
-        }
+        auth
       })
     } else {
       if (!isTestInstance()) {