diff --git a/services/web/app/coffee/Features/Email/EmailSender.coffee b/services/web/app/coffee/Features/Email/EmailSender.coffee
index 53450d6dab..97ffa1e2db 100644
--- a/services/web/app/coffee/Features/Email/EmailSender.coffee
+++ b/services/web/app/coffee/Features/Email/EmailSender.coffee
@@ -5,9 +5,9 @@ metrics = require("../../infrastructure/Metrics")
 ses = require('node-ses')
 
 if Settings.email? and Settings.email.fromAddress?
-	defaultFromAddress = ""
-else 
 	defaultFromAddress = Settings.email.fromAddress
+else 
+	defaultFromAddress = ""
 
 if Settings.email?.ses? and Settings.email.ses?.key? and Settings.email.ses?.key != "" and Settings.email.ses?.secret? and Settings.email.ses?.secret != ""
 	client = ses.createClient({ key: Settings.email.ses.key, secret: Settings.email.ses.secret });