diff --git a/roles/common/tasks/users.yml b/roles/common/tasks/users.yml
index 47e5979..fd6f024 100644
--- a/roles/common/tasks/users.yml
+++ b/roles/common/tasks/users.yml
@@ -1,8 +1,13 @@
 ---
 # Tasks to set users
+- group:
+    name: admin
+    state: present
+
 - user:
-    group: admin
     name: "{{ item }}"
+    comment: "Admin users"
+    group: admin
   with_items:
       - egon
       - wim
@@ -18,4 +23,3 @@
     user: egon
     key: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKUBdTEHUj6MxvfEU7KcI+UPAvqJ9jGJ7hHm3e7XFTb9 egon@egon-pc'
     state: present
-