From d67b9e5688c8d86da924d46bac6eeff7f172d693 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Wed, 28 Sep 2016 19:23:07 +0200
Subject: [PATCH] do not send welcome email if user already exists

---
 website/server/controllers/api-v3/auth.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/website/server/controllers/api-v3/auth.js b/website/server/controllers/api-v3/auth.js
index 2698accd9e..5ae93c8316 100644
--- a/website/server/controllers/api-v3/auth.js
+++ b/website/server/controllers/api-v3/auth.js
@@ -163,7 +163,9 @@ api.registerLocal = {
     // Clean previous email preferences and send welcome email
     EmailUnsubscription
       .remove({email: savedUser.auth.local.email})
-      .then(() => sendTxnEmail(savedUser, 'welcome'));
+      .then(() => {
+        if (!existingUser) sendTxnEmail(savedUser, 'welcome');
+      });
 
     if (!existingUser) {
       res.analytics.track('register', {
@@ -310,7 +312,9 @@ api.loginSocial = {
         EmailUnsubscription
         .remove({email: savedUser.auth[network].emails[0].value.toLowerCase()})
         .exec()
-        .then(() => sendTxnEmail(savedUser, 'welcome')); // eslint-disable-line max-nested-callbacks
+        .then(() => {
+          if (!existingUser) sendTxnEmail(savedUser, 'welcome');
+        }); // eslint-disable-line max-nested-callbacks
       }
 
       if (!existingUser) {