diff --git a/packages/sysutils/systemd/system.d/userconfig.service b/packages/sysutils/systemd/system.d/userconfig.service
index c023f22098..a79877e923 100644
--- a/packages/sysutils/systemd/system.d/userconfig.service
+++ b/packages/sysutils/systemd/system.d/userconfig.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=Setup User config dir
 DefaultDependencies=no
-After=local-fs.target
+Before=local-fs.target shutdown.target
+Conflicts=shutdown.target
 
 [Service]
 Type=oneshot
-ExecStart=/lib/systemd/openelec-userconfig
+ExecStart=/usr/lib/openelec/openelec-userconfig
 RemainAfterExit=yes
 
 [Install]
-WantedBy=sysinit.target
+WantedBy=local-fs.target