diff --git a/postgres/server/init.sls b/postgres/server/init.sls
index 987391e..3ffb75b 100644
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -62,7 +62,7 @@ postgresql-{{ bin }}-altinstall:
 
 postgresql-cluster-prepared:
   file.directory:
-    - name: {{ postgres.conf_dir }}
+    - name: {{ postgres.data_dir }}
     - user: {{ postgres.user }}
     - group: {{ postgres.group }}
     - makedirs: True
@@ -81,10 +81,12 @@ postgresql-cluster-prepared:
  {%- endif %}
     - cwd: /
     - env: {{ postgres.prepare_cluster.env }}
-    - runas: {{ postgres.user }}
+    - runas: {{ postgres.prepare_cluster.user }}
     - require:
       - pkg: postgresql-server
       - file: postgresql-cluster-prepared
+    - watch_in:
+      - module: postgresql-service-restart
 
 postgresql-config-dir:
   file.directory:
@@ -140,15 +142,15 @@ postgresql-conf:
     - watch_in:
       - module: postgresql-service-restart
 
+{%- endif %}
+
 # Restart the service where reloading is not sufficient
-# Currently only when changes are made to `postgresql.conf`
+# Currently when the cluster is created or changes made to `postgresql.conf`
 postgresql-service-restart:
   module.wait:
     - name: service.restart
     - m_name: {{ postgres.service }}
 
-{%- endif %}
-
 {%- set pg_hba_path = salt['file.join'](postgres.conf_dir, 'pg_hba.conf') %}
 
 postgresql-pg_hba: