diff --git a/src/freedombone-app-etherpad b/src/freedombone-app-etherpad
index 614c7454..41afe622 100755
--- a/src/freedombone-app-etherpad
+++ b/src/freedombone-app-etherpad
@@ -518,9 +518,10 @@ function install_etherpad {
     echo '' >> /etc/systemd/system/etherpad.service
     echo '[Service]' >> /etc/systemd/system/etherpad.service
     echo 'Type=simple' >> /etc/systemd/system/etherpad.service
-    echo 'User=etherpad-lite' >> /etc/systemd/system/etherpad.service
-    echo 'Group=etherpad-lite' >> /etc/systemd/system/etherpad.service
-    echo "ExecStart=/var/www/$ETHERPAD_DOMAIN_NAME/htdocs//bin/run.sh" >> /etc/systemd/system/etherpad.service
+    echo 'User=etherpad' >> /etc/systemd/system/etherpad.service
+    echo 'Group=etherpad' >> /etc/systemd/system/etherpad.service
+    echo "WorkingDirectory=/var/www/$ETHERPAD_DOMAIN_NAME/htdocs" >> /etc/systemd/system/etherpad.service
+    echo "ExecStart=/var/www/$ETHERPAD_DOMAIN_NAME/htdocs/bin/run.sh" >> /etc/systemd/system/etherpad.service
     echo '' >> /etc/systemd/system/etherpad.service
     echo '[Install]' >> /etc/systemd/system/etherpad.service
     echo 'WantedBy=multi-user.target' >> /etc/systemd/system/etherpad.service