diff --git a/mayan/settings/base.py b/mayan/settings/base.py
index 2754bb9d00..d51aa6db70 100644
--- a/mayan/settings/base.py
+++ b/mayan/settings/base.py
@@ -30,9 +30,9 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 SECRET_KEY = 'secret_key_missing'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['*']
 
 # Application definition
 
diff --git a/mayan/settings/production.py b/mayan/settings/production.py
index f14639d1b9..fa8a4c4ae6 100644
--- a/mayan/settings/production.py
+++ b/mayan/settings/production.py
@@ -2,13 +2,11 @@ from __future__ import absolute_import, unicode_literals
 
 from . import *  # NOQA
 
-DEBUG = False
-
 # Update this accordingly;
 # https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
 ALLOWED_HOSTS = ['*']
 
-TEMPLATES['OPTIONS']['loaders'] = (
+TEMPLATES[0]['OPTIONS']['loaders'] = (
     'django.template.loaders.cached.Loader', (
         'django.template.loaders.filesystem.Loader',
         'django.template.loaders.app_directories.Loader',