diff --git a/roles/common/tasks/users-systemfiles.yml b/roles/common/tasks/users-systemfiles.yml
index 356a1e8..f823651 100644
--- a/roles/common/tasks/users-systemfiles.yml
+++ b/roles/common/tasks/users-systemfiles.yml
@@ -34,7 +34,9 @@
   loop: "{{ default_user }}"
   loop_control:
     label: '{{ item.name }}'
-  when: lookup('fileglob', inventory_dir + '/files/homedirs/' + item.name + '/_bashrc')
+  when:
+    - lookup('fileglob', inventory_dir + '/files/homedirs/' + item.name)  
+    - lookup('fileglob', inventory_dir + '/files/homedirs/' + item.name + '/_bashrc')
   tags:
     - bash
 
@@ -58,7 +60,9 @@
     owner: root
     group: root
     mode: 0644
-  when: lookup('fileglob', inventory_dir + '/files/homedirs/root/_bashrc')
+  when: 
+    - lookup('fileglob', inventory_dir + '/files/homedirs/root')  
+    - lookup('fileglob', inventory_dir + '/files/homedirs/root/_bashrc')
   tags:
     - bash
 
@@ -95,7 +99,9 @@
   loop: "{{ default_user }}"
   loop_control:
     label: '{{ item.name }}'
-  when: lookup('fileglob', inventory_dir + '/files/homedirs/' + item.name + '/_profile')
+  when: 
+    - lookup('fileglob', inventory_dir + '/files/homedirs/' + item.name)  
+    - lookup('fileglob', inventory_dir + '/files/homedirs/' + item.name + '/_profile')
   tags:
     - profile
 
@@ -119,7 +125,9 @@
     owner: root
     group: root
     mode: 0644
-  when: lookup('fileglob', inventory_dir + '/files/homedirs/root/_profile')
+  when: 
+    - lookup('fileglob', inventory_dir + '/files/homedirs/root')  
+    - lookup('fileglob', inventory_dir + '/files/homedirs/root/_profile')
   tags:
     - profile
     
@@ -137,7 +145,9 @@
   loop: "{{ default_user }}"
   loop_control:
     label: '{{ item.name }}'
-  when: lookup('fileglob', inventory_dir + '/files/homedirs/' + item.name + '/_vimrc')
+  when:
+    - lookup('fileglob', inventory_dir + '/files/homedirs/' + item.name)  
+    - lookup('fileglob', inventory_dir + '/files/homedirs/' + item.name + '/_vimrc')
   tags:
     - vim
 
@@ -148,7 +158,9 @@
     owner: root
     group: root
     mode: 0644
-  when: lookup('fileglob', inventory_dir + '/files/homedirs/root/_vimrc')
+  when:
+    - lookup('fileglob', inventory_dir + '/files/homedirs/root')
+    - lookup('fileglob', inventory_dir + '/files/homedirs/' + item.name + '/_vimrc')
   tags:
     - vim