diff --git a/srcpkgs/deluge/files/deluge-web/run b/srcpkgs/deluge/files/deluge-web/run
index 666fb10783..44c75c9905 100644
--- a/srcpkgs/deluge/files/deluge-web/run
+++ b/srcpkgs/deluge/files/deluge-web/run
@@ -1,2 +1,3 @@
 #!/bin/sh
-exec chpst -u delugeweb:delugeweb deluge-web -d 2>&1
+sv check deluged >/dev/null || exit 1
+exec chpst -u deluge:deluge deluge-web 2>&1
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ffb2c76396..089f6cbe92 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,2 +1,5 @@
 #!/bin/sh
+set -e
+mkdir -p /var/lib/deluge
+chown deluge:deluge /var/lib/deluge
 exec chpst -u deluge:deluge deluged -d 2>&1
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 1c2ef2670d..2c843cb8d8 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -4,8 +4,9 @@ version=1.3.13
 revision=1
 noarch=yes
 build_style=python2-module
-system_accounts="deluge delugeweb"
 pycompile_module="deluge"
+system_accounts="deluge"
+deluge_homedir="/var/lib/deluge"
 hostmakedepends="intltool python-setuptools"
 makedepends="python-setuptools"
 depends="pygtk python-setuptools python-chardet python-xdg Twisted libtorrent-rasterbar-python xdg-utils"