diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4d0f3a6..09d25126 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 ### Added
 
+* evolinux_users: create only users who have a certain value for the `create` key (default: `always`).
 * php: install php-xml with recent PHP versions
 
 ### Changed
diff --git a/evolinux-users/README.md b/evolinux-users/README.md
index c0f6e9ef..9c7beab4 100644
--- a/evolinux-users/README.md
+++ b/evolinux-users/README.md
@@ -19,6 +19,7 @@ evolinux_users:
     groups: "baz"
     password_hash: 'sdfgsdfgsdfgsdfg'
     ssh_key: 'ssh-rsa AZERTYXYZ'
+    create: always
   bar:
     name: bar
     uid: 1002
@@ -30,6 +31,7 @@ evolinux_users:
     ssh_keys:
       - 'ssh-rsa QWERTYUIOP'
       - 'ssh-ed25519 QWERTYUIOP'
+    create: on_demand
 ```
 
 * `evolinux_sudo_group`: which group to use for sudo (default: `evolinux-sudo`)
diff --git a/evolinux-users/defaults/main.yml b/evolinux-users/defaults/main.yml
index 8ff94551..658e4a31 100644
--- a/evolinux-users/defaults/main.yml
+++ b/evolinux-users/defaults/main.yml
@@ -6,3 +6,6 @@ evolinux_ssh_group: "evolinux-ssh"
 evolinux_internal_group: ""
 
 evolinux_root_disable_ssh: True
+
+# Defines which groups of users are created
+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 1b838e01..d105aefe 100644
--- a/evolinux-users/tasks/main.yml
+++ b/evolinux-users/tasks/main.yml
@@ -16,7 +16,9 @@
   vars:
     user: "{{ item.value }}"
   loop: "{{ evolinux_users | dict2items }}"
-  when: evolinux_users | length > 0
+  when: 
+    - user.create == evolinux_users_create
+    - evolinux_users | length > 0
 
 - name: Configure sudo
   include: sudo.yml
diff --git a/evolinux-users/tasks/ssh.yml b/evolinux-users/tasks/ssh.yml
index b0bf8b58..25a08297 100644
--- a/evolinux-users/tasks/ssh.yml
+++ b/evolinux-users/tasks/ssh.yml
@@ -50,6 +50,7 @@
     user: "{{ item.value }}"
   loop: "{{ evolinux_users | dict2items }}"
   when:
+    - 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 4056e7ad..769e7a4e 100644
--- a/evolinux-users/tasks/sudo.yml
+++ b/evolinux-users/tasks/sudo.yml
@@ -6,6 +6,7 @@
   loop: "{{ evolinux_users | dict2items }}"
   when:
     - evolinux_users | length > 0
+    - user.create == evolinux_users_create
     - ansible_distribution_release == "jessie"
 
 
@@ -16,6 +17,9 @@
     vars:
       user: "{{ item.value }}"
     loop: "{{ evolinux_users | dict2items }}"
+    when:
+      - evolinux_users | length > 0
+      - user.create == evolinux_users_create
   when:
     - ansible_distribution_major_version is defined
     - ansible_distribution_major_version is version('9', '>=')