diff --git a/roles/slurm-common/tasks/main.yml b/roles/slurm-common/tasks/main.yml
index a75f57a6063b5086ad4142ee4dda0840039164b7..cd22e7d3924fa0ccd6a60dbb6e82f61c51780f71 100644
--- a/roles/slurm-common/tasks/main.yml
+++ b/roles/slurm-common/tasks/main.yml
@@ -27,11 +27,16 @@
   file: path={{ slurmdatadir }} state=directory owner=slurm group=slurm mode=755
   sudo: true
   when: slurmdatadir is defined 
+      
+- name: stat run directory
+  stat: path={{ slurmpiddir }} 
+  register: runstat
+  when: slurmpiddir is defined
 
 - name: create run directory
   file: path={{ slurmpiddir }} state=directory owner=root group=root mode=750
   sudo: true
-  when: slurmpiddir is defined 
+  when: slurmpiddir is defined and not runstat.stat.exists
 
 - name: create state directory
   file: path={{ slurmstatedir }} state=directory owner=slurm group=slurm mode=750
diff --git a/roles/slurmdb-config/templates/slurmdblog.j2 b/roles/slurmdb-config/templates/slurmdblog.j2
index f9042d6b392781293a35c0c4d70f09f63813e809..e950c18286cbc00771c94cf520f97dd5fb9d6104 100644
--- a/roles/slurmdb-config/templates/slurmdblog.j2
+++ b/roles/slurmdb-config/templates/slurmdblog.j2
@@ -1,5 +1,4 @@
 {{ slurmdbdlog.log }}
-{% endif %}
 {
  compress
  missingok