diff --git a/group-all.yml b/group-all.yml
index 0660986..e840c91 100644
--- a/group-all.yml
+++ b/group-all.yml
@@ -11,6 +11,7 @@
     - role: ansible.timezone
       vars:
         ag_timezone: "{{ timezone }}"
+    - role: users
 
   tasks:
     - name: Update and clean package cache
@@ -41,8 +42,3 @@
         name:
           - molly-guard
           - mc
-
-
-    - name: Setup users
-      include_role:
-        name: users