diff --git a/CHANGELOG.md b/CHANGELOG.md
index c74ef4e5..48e314f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ The **patch** part changes incrementally at each release.
 ### Changed
 
 ### Fixed
+* evolinux-users: secondary groups are comma-separated
 
 ### Security
 
diff --git a/evolinux-users/tasks/user.yml b/evolinux-users/tasks/user.yml
index f7cf31ba..bd480cfb 100644
--- a/evolinux-users/tasks/user.yml
+++ b/evolinux-users/tasks/user.yml
@@ -87,14 +87,18 @@
   with_items: "{{ user.groups }}"
   loop_control:
     loop_var: group
-  when: user.groups is defined
+  when:
+    - user.groups is defined
+    - user.groups != []
 
 - name: "Unix user '{{ user.name }}' belongs to secondary groups"
   user:
     name: '{{ user.name }}'
-    groups: "{{ user.groups }}"
+    groups: "{{ user.groups | join(',') }}"
     append: yes
-  when: user.groups is defined
+  when:
+    - user.groups is defined
+    - user.groups != []
 
 # Permissions on home directory