diff --git a/src/freedombone-app-radicale b/src/freedombone-app-radicale
index e566d9bf..9f57a128 100755
--- a/src/freedombone-app-radicale
+++ b/src/freedombone-app-radicale
@@ -282,6 +282,7 @@ function remove_radicale {
     fi
 
     firewall_remove ${RADICALE_PORT} tcp
+    deluser radicale
 
     function_check remove_onion_service
     remove_onion_service radicale ${RADICALE_ONION_PORT}
@@ -320,6 +321,9 @@ function install_radicale {
 
     apt-get -yq remove --purge radicale python-radicale
 
+    useradd -c "Radicale system account" -d /var/www/radicale -m -r -g radicale radicale
+    usermod -a -G www-data radicale
+
     # create directories
     if [ ! -d /var/log/radicale ]; then
         mkdir /var/log/radicale