diff --git a/debian/hts-tvheadend.tvheadend.init b/debian/hts-tvheadend.init
similarity index 98%
rename from debian/hts-tvheadend.tvheadend.init
rename to debian/hts-tvheadend.init
index 4a96f4bc..dd3fc575 100644
--- a/debian/hts-tvheadend.tvheadend.init
+++ b/debian/hts-tvheadend.init
@@ -16,7 +16,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
 DESC="HTS Tvheadend"
 NAME=tvheadend
 DAEMON=/usr/bin/$NAME
-DAEMON_ARGS="-f"
+DAEMON_ARGS="-f -u hts -g video"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
diff --git a/debian/hts-tvheadend.postinst b/debian/hts-tvheadend.postinst
new file mode 100644
index 00000000..6324fcc0
--- /dev/null
+++ b/debian/hts-tvheadend.postinst
@@ -0,0 +1,26 @@
+#! /bin/sh -e
+
+HTS_USER=hts
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+case "$1" in
+configure)
+
+   if ! getent passwd $HTS_USER >/dev/null; then
+        echo "Creating user: $HTS_USER..."
+        adduser --quiet --system --group --shell /bin/bash $HTS_USER
+   fi
+   ;;
+*)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 0
+    ;;
+esac
+
+db_stop
+
+#DEBHELPER#
+
+exit 0