diff --git a/zproject/local_settings.py b/zproject/local_settings.py
index d826af08e4..aa0847cac7 100644
--- a/zproject/local_settings.py
+++ b/zproject/local_settings.py
@@ -174,5 +174,7 @@ NAGIOS_STAGING_RECEIVE_BOT = 'cordelia@zulip.com'
 ZULIP_ADMINISTRATOR = 'support@zulip.com'
 
 # TODO: Store this info in the database
-API_SUPER_USERS = set(["tabbott/extra@mit.edu", "emailgateway@zulip.com",
-                       "irc-bot@zulip.com", "bot1@customer35.invalid"])
+# Also note -- the email gateway bot is automatically added.
+API_SUPER_USERS = set(["tabbott/extra@mit.edu",
+                       "irc-bot@zulip.com",
+                       "bot1@customer35.invalid"])
diff --git a/zproject/settings.py b/zproject/settings.py
index 7628595b3e..4a337baed8 100644
--- a/zproject/settings.py
+++ b/zproject/settings.py
@@ -288,6 +288,9 @@ for bot in REALM_BOTS:
         bot_email = bot['email_template'] % (ADMIN_DOMAIN,)
         vars()[bot['var_name'] ] = bot_email
 
+if EMAIL_GATEWAY_BOT not in API_SUPER_USERS:
+    API_SUPER_USERS.add(EMAIL_GATEWAY_BOT)
+
 # Static files and minification
 
 STATIC_URL = '/static/'