diff --git a/files/usertwist.service b/files/usertwist.service
index 8c88647..17cd2d9 100644
--- a/files/usertwist.service
+++ b/files/usertwist.service
@@ -2,8 +2,8 @@
 Description=Simple Web Service
 
 [Service]
-User=caddy
-Group=caddy
+User=usertwist
+Group=usertwist
 ExecStart=/usr/local/bin/usertwist
 
 [Install]
diff --git a/tasks/install_caddy.yml b/tasks/install_caddy.yml
index 79ec97e..895013e 100644
--- a/tasks/install_caddy.yml
+++ b/tasks/install_caddy.yml
@@ -29,6 +29,12 @@
       src: ../templates/Caddyfile.j2
       dest: /etc/caddy/Caddyfile
 
+  - name: Create the usertwist user
+    ansible.builtin.user:
+      name: usertwist
+      group: usertwist
+      system: true
+
   - name: Put the service binary on the remote server
     ansible.builtin.copy:
       src: ../files/usertwist