diff --git a/defaults/main.yml b/defaults/main.yml
index 952fe00..71f5507 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -24,6 +24,6 @@ zammad_log_file: zammad.log
 zammad_log_name: zammad
 zammad_log_path: /var/log/zammad
 zammad_repo: https://github.com/zammad/zammad.git
-zammad_user: zammad
-zammad_user_home: "/home/{{ zammad_user }}"
+zammad_user: _zammad
+zammad_user_home: /var/lib/zammad
 zammad_webserver_configuration: "/etc/nginx/sites-available/{{ zammad_domain }}"
diff --git a/tasks/user.yml b/tasks/user.yml
index f8231f8..7977445 100644
--- a/tasks/user.yml
+++ b/tasks/user.yml
@@ -1,6 +1,13 @@
----
-- name: "user: Systemkonto anlegen"
+- name: "user | Erstelle Gruppe"
+  group:
+    name: "{{ zammad_user }}"
+    state: present
+
+- name: "user | Systemkonto anlegen"
   user:
     name: "{{ zammad_user }}"
+    group: "{{ zammad_user }}"
+    home: "{{ zammad_user_home }}"
     shell: /bin/bash
     password_lock: yes
+    system: yes