diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt
index 8e579eea3..74abc00a4 100644
--- a/{{cookiecutter.repo_name}}/requirements/base.txt
+++ b/{{cookiecutter.repo_name}}/requirements/base.txt
@@ -32,5 +32,7 @@ django-autoslug==1.7.2
 # Useful things
 django-avatar==2.0
 
+# Time zones support
+pytz==2014.7
 
 # Your custom requirements go here
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py
index feb8c8e1f..5f3d8cd54 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py
@@ -1,5 +1,21 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+import os
 
 from .local import Local  # noqa
 from .production import Production  # noqa
+
+
+try:
+    from django.conf import settings
+    from django.core.checks import register, Error
+    @register(settings)
+    def dj_database_url_check(app_configs=None, **kwargs):
+        errors = []
+        password = settings.DATABASES['default'].get('PASSWORD')
+        config = os.environ['DJANGO_CONFIGURATION'].lower()
+        if password == 'blank' and config == 'production':
+            errors.append(Error('Change the database password for production.'))
+        return errors
+except ImportError:
+    pass
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py
index caa4d1995..f11e14fc8 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/common.py
@@ -112,7 +112,7 @@ class Common(Configuration):
 
     # DATABASE CONFIGURATION
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#databases
-    DATABASES = values.DatabaseURLValue('postgres://localhost/{{cookiecutter.repo_name}}')
+    DATABASES = values.DatabaseURLValue('postgres://localhost/django:blank@{{cookiecutter.repo_name}}')
     # END DATABASE CONFIGURATION
 
     # CACHING