diff --git a/admin-users/tasks/sudo.yml b/admin-users/tasks/sudo.yml
index f8daf81f..347a7f34 100644
--- a/admin-users/tasks/sudo.yml
+++ b/admin-users/tasks/sudo.yml
@@ -24,3 +24,16 @@
   - ansible_distribution == "Debian"
   - ansible_distribution_release == "jessie"
   - not copy_sudoers_evolinux.changed
+
+- name: "Create evolinux-sudo group"
+  group:
+    name: evolinux-sudo
+    system: yes
+  when: ansible_distribution_major_version | version_compare('9', '>=')
+
+- name: "Add user to sudo group (Debian 9 or later)"
+  user:
+    name: '{{ user.name }}'
+    groups: 'evolinux-sudo,{{ admin_users_group }}'
+    append: yes
+  when: ansible_distribution_major_version | version_compare('9', '>=')
diff --git a/admin-users/tasks/user.yml b/admin-users/tasks/user.yml
index 604af57c..b0126ca8 100644
--- a/admin-users/tasks/user.yml
+++ b/admin-users/tasks/user.yml
@@ -35,24 +35,11 @@
    update_password: on_create
   when: loginisbusy.rc != 0 and uidisbusy.rc == 0
 
-- name: "Create evolinux-sudo group"
-  group:
-    name: evolinux-sudo
-    system: yes
-  when: ansible_distribution_major_version | version_compare('9', '>=')
-
 - name: "Create {{ admin_users_group }} group"
   group:
     name: "{{ admin_users_group }}"
   when: ansible_distribution_major_version | version_compare('9', '>=')
 
-- name: "Add user to sudo group (Debian 9 or later)"
-  user:
-    name: '{{ user.name }}'
-    groups: 'evolinux-sudo,{{ admin_users_group }}'
-    append: yes
-  when: ansible_distribution_major_version | version_compare('9', '>=')
-
 - name: "Fix perms on homedirectory for '{{ user.name }}'"
   file:
    name: '/home/{{ user.name }}'