diff --git a/tasks/main.yml b/tasks/main.yml
index 074b462..c5bc5b6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,7 +1,16 @@
 ---
 
-- include: groups.yml
-- include: user.yml
+- include: user_groups.yml
+  when: user_groups is defined
+
+- include: users.yml
+  when: users is defined
+
 - include: home.yml
+  when: users is defined
+
 - include: ssh.yml
+  when: users is defined
+
 - include: linger.yml
+  when: users is defined
diff --git a/tasks/groups.yml b/tasks/user_groups.yml
similarity index 80%
rename from tasks/groups.yml
rename to tasks/user_groups.yml
index e796748..26e7cd5 100644
--- a/tasks/groups.yml
+++ b/tasks/user_groups.yml
@@ -5,4 +5,3 @@
     name: "{{ item }}"
     gid: "{{ user_groups[item].gid }}"
   with_items: "{{ user_groups.keys() }}"
-  when: user_groups is defined
diff --git a/tasks/user.yml b/tasks/users.yml
similarity index 100%
rename from tasks/user.yml
rename to tasks/users.yml