diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 6eaf3a2ec59107e480ce4423f153e588b17a819f..5396a8c448f8badf2c714a91b8aaa3b0434892fb 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -24,6 +24,11 @@ DATABASES['default'].update(db_from_env)
 
 ALLOWED_HOSTS = [".localhost", ".herokuapp.com", ".northbaypython.org"]
 
+# If DEFAULT_FROM_EMAIL is not set, email will most likely break in prod.
+from_email = os.environ.get("DJANGO_DEFAULT_FROM_EMAIL", None)
+if from_email is not None:
+    DEFAULT_FROM_EMAIL = from_email
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.