diff --git a/hddemux.service b/hddemux.service
index 01d557d66ec1d777bb8f98b3361f8c1970ded690..356c247c4f651f3cb3f06cc63cce26b04307c8db 100644
--- a/hddemux.service
+++ b/hddemux.service
@@ -1,13 +1,14 @@
 [Unit]
 Description=HTTP/DNS demuxer service
 Documentation=man:hddemux(1)
-## This is a socket-activated service:
-RefuseManualStart=true
+Requires=hddemux.socket
 
 [Service]
 Type=notify
 ExecStart=/usr/bin/hddemux
 WorkingDirectory=/run/hddemux/workdir
+User=hddemux
+Group=hddemux
 
 [Install]
-WantedBy=sockets.target
+Also=hddemux.socket
diff --git a/hddemux.socket b/hddemux.socket
index 644e430e5ba2e13a4cc28538b5fc95db56c22966..35ac9ab7bf51ddff58a4d9e6bb6720e420531365 100644
--- a/hddemux.socket
+++ b/hddemux.socket
@@ -1,7 +1,6 @@
 [Unit]
 Description=HTTP/DNS demuxer socket
 Documentation=man:hddemux(1)
-Before=sockets.target
 
 [Socket]
 ListenStream=/run/hddemux/socket