diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
index 63c647bf7..42e1dc85d 100755
--- a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
+++ b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
@@ -25,6 +25,7 @@ chown $user:$user /home/$user
 chmod 755 /home/$user
 
 ln -s /pycharm_helpers/ /home/$user/.pycharm_helpers
+chown $user:$user /pycharm_helpers/ /home/$user/.pycharm_helpers
 
 # TODO: get public key authorization to work
 mkdir /home/$user/.ssh
diff --git a/{{cookiecutter.repo_name}}/config/settings/common.py b/{{cookiecutter.repo_name}}/config/settings/common.py
index 08ff8085f..5eb916a58 100644
--- a/{{cookiecutter.repo_name}}/config/settings/common.py
+++ b/{{cookiecutter.repo_name}}/config/settings/common.py
@@ -100,9 +100,9 @@ MANAGERS = ADMINS
 DATABASES = {
     # Raises ImproperlyConfigured exception if DATABASE_URL not in os.environ
     {% if cookiecutter.use_docker == 'y' %}
-    'default': 'postgres://postgres@postgres/postgres'),
+    'default': env.db('DATABASE_URL', default='postgres://postgres@postgres/postgres'),
     {% else %}
-    'default': env.db("DATABASE_URL", default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.repo_name}}"),
+    'default': env.db('DATABASE_URL', default='postgres://{% if cookiecutter.windows == "y" %}localhost{% endif %}/{{cookiecutter.repo_name}}'),
     {% endif %}
 }
 DATABASES['default']['ATOMIC_REQUESTS'] = True