diff --git a/webapps/evoadmin-web/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml
index 377f7f60..c5e5a35b 100644
--- a/webapps/evoadmin-web/tasks/user.yml
+++ b/webapps/evoadmin-web/tasks/user.yml
@@ -12,6 +12,18 @@
     name: www-evoadmin
     state: present
 
+- name: "Create www-evoadmin and add to group shadow (jessie)"
+  user:
+    name: www-evoadmin
+    groups: shadow
+    append: yes
+  when: ansible_distribution_release == "jessie"
+
+- name: "Create www-evoadmin (Debian 9 or later)"
+  user:
+    name: www-evoadmin
+  when: ansible_distribution_major_version | version_compare('9', '>=')
+
 - name: Install Git
   apt:
     name: git
@@ -61,13 +73,6 @@
   with_items:
   - "{{ evoadmin_home_dir}}/www"
 
-- name: "Add www-evoadmin to group shadow (jessie)"
-  user:
-    name: www-evoadmin
-    groups: shadow
-    append: yes
-  when: ansible_distribution_release == "jessie"
-
 - name: Add evoadmin sudoers file
   template:
     src: sudoers.j2