diff --git a/roles/setupKnownHosts/templates/known_hosts.j2 b/roles/setupKnownHosts/templates/known_hosts.j2
index c5df8c27755da771d9fc950e19351c48f0f30a2d..aaea3a9de8b331d446960dcb4551575799c909db 100644
--- a/roles/setupKnownHosts/templates/known_hosts.j2
+++ b/roles/setupKnownHosts/templates/known_hosts.j2
@@ -10,6 +10,5 @@
 {% endfor %}
 
 {% for host in nodelist|unique %}
-{{ host.name }} {{ host.rsa }}
-{{ host.ip }} {{ host.rsa }}
+{{ host.ip }} {{ host.name }} {{ host.rsa }}
 {% endfor %}
diff --git a/roles/slurm-provision/templates/slurm_provision.sh.j2 b/roles/slurm-provision/templates/slurm_provision.sh.j2
index 8cf5376ecc6c75a0a0b4dd1dfb0bda58644dca06..e1dda7c2196223c255da932fe42d1229ed27a973 100644
--- a/roles/slurm-provision/templates/slurm_provision.sh.j2
+++ b/roles/slurm-provision/templates/slurm_provision.sh.j2
@@ -8,7 +8,7 @@ for user in ${user_list[*]}; do
     uid=$(id -u ${user})
     gid=$(id -g ${user})
     user_home=${CVL_HOME}/${user}
-    if [ ! -d ${user_home} ]; then
+    if [[ ! -d ${user_home} && ${uid} -gt 1000 ]]; then
         mkdir -p ${user_home}
         cp -r /etc/skel/* ${user_home}
         chown -R ${uid}:${gid} ${user_home}