diff --git a/CHANGELOG.md b/CHANGELOG.md
index b01a2bb1..d4405a2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 ### Added
 
 * php: install php-xml with recent PHP versions
-* evolinux_user_create variable for evolinux-users that allows creating only a subset of users, defaults to active
+* evolinux_user_create variable for evolinux-users that allows creating only a subset of users, defaults to always
 
 ### Changed
 
diff --git a/evolinux-users/defaults/main.yml b/evolinux-users/defaults/main.yml
index cbe6bca4..658e4a31 100644
--- a/evolinux-users/defaults/main.yml
+++ b/evolinux-users/defaults/main.yml
@@ -8,5 +8,4 @@ evolinux_internal_group: ""
 evolinux_root_disable_ssh: True
 
 # Defines which groups of users are created
-evolinux_users_create:
-  - active
\ No newline at end of file
+evolinux_users_create: always
\ No newline at end of file
diff --git a/evolinux-users/tasks/main.yml b/evolinux-users/tasks/main.yml
index e8c52408..d105aefe 100644
--- a/evolinux-users/tasks/main.yml
+++ b/evolinux-users/tasks/main.yml
@@ -17,7 +17,7 @@
     user: "{{ item.value }}"
   loop: "{{ evolinux_users | dict2items }}"
   when: 
-    - user.create | intersect(evolinux_users_create) | length > 0
+    - user.create == evolinux_users_create
     - evolinux_users | length > 0
 
 - name: Configure sudo
diff --git a/evolinux-users/tasks/ssh.yml b/evolinux-users/tasks/ssh.yml
index 16c4eb67..25a08297 100644
--- a/evolinux-users/tasks/ssh.yml
+++ b/evolinux-users/tasks/ssh.yml
@@ -50,7 +50,7 @@
     user: "{{ item.value }}"
   loop: "{{ evolinux_users | dict2items }}"
   when:
-    - user.create | intersect(evolinux_users_create) | length > 0
+    - user.create == evolinux_users_create
     - ssh_allowusers
     - not ssh_allowgroups
 
diff --git a/evolinux-users/tasks/sudo.yml b/evolinux-users/tasks/sudo.yml
index fa537079..769e7a4e 100644
--- a/evolinux-users/tasks/sudo.yml
+++ b/evolinux-users/tasks/sudo.yml
@@ -6,7 +6,7 @@
   loop: "{{ evolinux_users | dict2items }}"
   when:
     - evolinux_users | length > 0
-    - user.create | intersect(evolinux_users_create) | length > 0
+    - user.create == evolinux_users_create
     - ansible_distribution_release == "jessie"
 
 
@@ -19,7 +19,7 @@
     loop: "{{ evolinux_users | dict2items }}"
     when:
       - evolinux_users | length > 0
-      - user.create | intersect(evolinux_users_create) | length > 0
+      - user.create == evolinux_users_create
   when:
     - ansible_distribution_major_version is defined
     - ansible_distribution_major_version is version('9', '>=')