diff --git a/appstore/appstore/settings/base.py b/appstore/appstore/settings/base.py
index 5b52eb78..c15bd75a 100644
--- a/appstore/appstore/settings/base.py
+++ b/appstore/appstore/settings/base.py
@@ -235,13 +235,15 @@
 )
 
 # Email configuration
+# UNC Relay: relay.unc.edu:25
+# Renci Relay: relay.renci.org
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
-EMAIL_HOST =os.environ.get("EMAIL_HOST","relay.unc.edu")
-EMAIL_PORT = os.environ.get("EMAIL_PORT", "25")
+EMAIL_HOST =os.environ.get("EMAIL_HOST","")
+EMAIL_PORT = os.environ.get("EMAIL_PORT", "")
 EMAIL_HOST_USER = os.environ.get("EMAIL_HOST_USER", "appstore@renci.org")
 EMAIL_HOST_PASSWORD = os.environ.get("EMAIL_HOST_PASSWORD", "")
 RECIPIENT_EMAILS = os.environ.get("RECIPIENT_EMAILS", "")
-EMAIL_USE_TLS = False
+EMAIL_USE_TLS = os.environ.get("EMAIL_USE_TLS", False) # Boolean
 DEFAULT_FROM_EMAIL = os.environ.get("APPSTORE_DEFAULT_FROM_EMAIL", EMAIL_HOST_USER)
 DEFAULT_SUPPORT_EMAIL = os.environ.get(
     "APPSTORE_DEFAULT_SUPPORT_EMAIL", EMAIL_HOST_USER