diff --git a/src/newsreader/conf/base.py b/src/newsreader/conf/base.py
index d41f352..d6bef7f 100644
--- a/src/newsreader/conf/base.py
+++ b/src/newsreader/conf/base.py
@@ -193,7 +193,8 @@ STATICFILES_FINDERS = [
     "django.contrib.staticfiles.finders.AppDirectoriesFinder",
 ]
 
-DEFAULT_FROM_EMAIL = "newsreader@rss.fudiggity.nl"
+# Email
+EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
 # Project settings
 VERSION = get_current_version()
diff --git a/src/newsreader/conf/production.py b/src/newsreader/conf/production.py
index f481885..bbda117 100644
--- a/src/newsreader/conf/production.py
+++ b/src/newsreader/conf/production.py
@@ -45,6 +45,15 @@ TEMPLATES = [
     }
 ]
 
+# Email
+EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+EMAIL_HOST = os.environ.get("EMAIL_HOST")
+EMAIL_PORT = os.environ.get("EMAIL_PORT")
+EMAIL_HOST_USER = os.environ.get("EMAIL_HOST_USER")
+EMAIL_HOST_PASSWORD = os.environ.get("EMAIL_HOST_PASSWORD")
+EMAIL_USE_TLS = os.environ.get("EMAIL_USE_TLS")
+EMAIL_USE_SSL = os.environ.get("EMAIL_USE_SSL")
+
 # Reddit integration
 REDDIT_CLIENT_ID = os.environ.get("REDDIT_CLIENT_ID", "")
 REDDIT_CLIENT_SECRET = os.environ.get("REDDIT_CLIENT_SECRET", "")
diff --git a/src/newsreader/news/collection/tasks.py b/src/newsreader/news/collection/tasks.py
index b82bf66..9ca65f9 100644
--- a/src/newsreader/news/collection/tasks.py
+++ b/src/newsreader/news/collection/tasks.py
@@ -106,6 +106,8 @@ class RedditTokenTask(app.Task):
 
             user.reddit_refresh_token = None
             user.save()
+
+            # TODO add notification mail
             return
 
         response_data = response.json()
diff --git a/src/newsreader/news/collection/twitter.py b/src/newsreader/news/collection/twitter.py
index e56ec13..debe31e 100644
--- a/src/newsreader/news/collection/twitter.py
+++ b/src/newsreader/news/collection/twitter.py
@@ -240,6 +240,8 @@ class TwitterClient(PostClient):
                     stream.rule.user.twitter_oauth_token_secret = None
                     stream.rule.user.save()
 
+                    # TODO add notification mail
+
                     self.set_rule_error(stream.rule, e)
 
                     break