diff --git a/env b/env
index eb8bcf888..9451a2bf1 100644
--- a/env
+++ b/env
@@ -25,6 +25,7 @@ DISABLE_DOWNVOTES=0
 DUES=10
 DEFAULT_THEME=midnight
 DEFAULT_COLOR=ff66ac
+MAIL_SERVER=smtp.gmail.com
 MAIL_USERNAME=blahblahblah@gmail.com
 MAIL_PASSWORD=blahblahblah
 DESCRIPTION=DESCRIPTION GOES HERE
diff --git a/files/__main__.py b/files/__main__.py
index 388ab2984..9ddb096af 100644
--- a/files/__main__.py
+++ b/files/__main__.py
@@ -51,7 +51,7 @@ app.config["COMMENT_SPAM_SIMILAR_THRESHOLD"] = float(environ.get("COMMENT_SPAM_S
 app.config["COMMENT_SPAM_COUNT_THRESHOLD"] = int(environ.get("COMMENT_SPAM_COUNT_THRESHOLD", 10))
 app.config["CACHE_TYPE"] = "RedisCache"
 app.config["CACHE_REDIS_URL"] = environ.get("REDIS_URL", "redis://localhost")
-app.config['MAIL_SERVER'] = 'smtp.gmail.com'
+app.config['MAIL_SERVER'] = environ.get("MAIL_SERVER", "").strip()
 app.config['MAIL_PORT'] = 587
 app.config['MAIL_USE_TLS'] = True
 app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME", "").strip()