diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py
index 2fa0127a8..5f3d8cd54 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py
@@ -1,18 +1,21 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 import os
-from django.conf import settings
-from django.core.checks import register, Error
 
 from .local import Local  # noqa
 from .production import Production  # noqa
 
 
-@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
+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 46c3e2a87..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/django:blank{{cookiecutter.repo_name}}')
+    DATABASES = values.DatabaseURLValue('postgres://localhost/django:blank@{{cookiecutter.repo_name}}')
     # END DATABASE CONFIGURATION
 
     # CACHING