diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4eefc696..30bd12d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ The **patch** part changes incrementally at each release.
 
 ### Changed
 
+* Create system users for vmail (dovecot) and evoadmin
 * apt: disable APT Periodic
 * evoacme: upstream release 20.12
 * evocheck: upstream release 20.12
diff --git a/dovecot/tasks/main.yml b/dovecot/tasks/main.yml
index 8508a902..1a7e4280 100644
--- a/dovecot/tasks/main.yml
+++ b/dovecot/tasks/main.yml
@@ -41,6 +41,7 @@
   group:
     name: vmail
     gid: "{{ dovecot_vmail_gid }}"
+    system: True
   tags:
   - dovecot
 
@@ -50,6 +51,7 @@
     group: vmail
     uid: "{{ dovecot_vmail_uid }}"
     shell: /bin/false
+    system: True
   tags:
   - dovecot
 
diff --git a/webapps/evoadmin-web/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml
index 5aa6c29c..7b58270c 100644
--- a/webapps/evoadmin-web/tasks/user.yml
+++ b/webapps/evoadmin-web/tasks/user.yml
@@ -6,6 +6,7 @@
     comment: "Evoadmin Web Account"
     home: "{{ evoadmin_home_dir }}"
     password: "!"
+    system: yes
 
 - name: Create www-evoadmin group
   group:
@@ -22,6 +23,7 @@
 - name: "Create www-evoadmin (Debian 9 or later)"
   user:
     name: www-evoadmin
+    system: yes
   when: ansible_distribution_major_version is version('9', '>=')
 
 - name: Is /etc/aliases present?