diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 9a37a44a929c..2ab79d336f57 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -108,6 +108,13 @@
 
 EMAIL_BACKEND = ENV_TOKENS.get('EMAIL_BACKEND', EMAIL_BACKEND)
 EMAIL_FILE_PATH = ENV_TOKENS.get('EMAIL_FILE_PATH', None)
+
+EMAIL_HOST = ENV_TOKENS.get('EMAIL_HOST', EMAIL_HOST)
+EMAIL_PORT = ENV_TOKENS.get('EMAIL_PORT', EMAIL_PORT)
+EMAIL_USE_TLS = ENV_TOKENS.get('EMAIL_USE_TLS', EMAIL_USE_TLS)
+EMAIL_HOST_USER = AUTH_TOKENS.get('EMAIL_HOST_USER', EMAIL_HOST_USER)
+EMAIL_HOST_PASSWORD = AUTH_TOKENS.get('EMAIL_HOST_PASSWORD', EMAIL_HOST_PASSWORD)
+
 LMS_BASE = ENV_TOKENS.get('LMS_BASE')
 # Note that FEATURES['PREVIEW_LMS_BASE'] gets read in from the environment file.
 
diff --git a/cms/envs/common.py b/cms/envs/common.py
index daea3a3f0efa..1d2dd3040838 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -197,6 +197,11 @@
 
 # Email
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+EMAIL_HOST = 'localhost'
+EMAIL_PORT = 25
+EMAIL_USE_TLS = False
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
 DEFAULT_FROM_EMAIL = 'registration@example.com'
 DEFAULT_FEEDBACK_EMAIL = 'feedback@example.com'
 SERVER_EMAIL = 'devops@example.com'