diff --git a/mayan/settings/base.py b/mayan/settings/base.py
index 5012d4ad32..5aefee26ec 100644
--- a/mayan/settings/base.py
+++ b/mayan/settings/base.py
@@ -190,6 +190,7 @@ TEMPLATE_LOADERS = (
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.auth.context_processors.auth',
+    'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'django.core.context_processors.static',
     'django.core.context_processors.request',
@@ -214,6 +215,7 @@ WEB_THEME_ENABLE_SCROLL_JS = False
 # --------- Django -------------------
 LOGIN_URL = 'common:login_view'
 LOGIN_REDIRECT_URL = 'main:home'
+INTERNAL_IPS = ('127.0.0.1',)
 # -------- LoginRequiredMiddleware ----------
 LOGIN_EXEMPT_URLS = (
     r'^favicon\.ico$',
diff --git a/mayan/settings/development.py b/mayan/settings/development.py
index 386cad20eb..85aa4d651e 100644
--- a/mayan/settings/development.py
+++ b/mayan/settings/development.py
@@ -7,8 +7,6 @@ TEMPLATE_DEBUG = DEBUG
 
 ALLOWED_HOSTS = ['*']
 
-INTERNAL_IPS = ('127.0.0.1',)
-
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader'
@@ -19,8 +17,4 @@ INSTALLED_APPS += (
     'django_extensions',
 )
 
-# Stop debug toolbar patching!
-# see https://github.com/django-debug-toolbar/django-debug-toolbar/issues/524
-TEMPLATE_CONTEXT_PROCESSORS += ('django.core.context_processors.debug',)
-
 WSGI_AUTO_RELOAD = True
diff --git a/mayan/settings/development_ddt.py b/mayan/settings/development_ddt.py
index 37b261c268..d81caa13ca 100644
--- a/mayan/settings/development_ddt.py
+++ b/mayan/settings/development_ddt.py
@@ -7,8 +7,6 @@ TEMPLATE_DEBUG = DEBUG
 
 ALLOWED_HOSTS = ['*']
 
-INTERNAL_IPS = ('127.0.0.1',)
-
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader'
@@ -24,8 +22,6 @@ INSTALLED_APPS += (
 # see https://github.com/django-debug-toolbar/django-debug-toolbar/issues/524
 DEBUG_TOOLBAR_PATCH_SETTINGS = False
 
-TEMPLATE_CONTEXT_PROCESSORS += ('django.core.context_processors.debug',)
-
 WSGI_AUTO_RELOAD = True
 
 MIDDLEWARE_CLASSES = ('debug_toolbar.middleware.DebugToolbarMiddleware',) + MIDDLEWARE_CLASSES