diff --git a/conf/systemd.service b/conf/systemd.service
index d601c76..287a28f 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -6,8 +6,9 @@ After=network.target cjdns.service
 User=root
 Group=root
 WorkingDirectory=__INSTALL_DIR__/
-ExecStart=/bin/bash -c '__INSTALL_DIR__/cjdroute < __INSTALL_DIR__/cjdroute.conf'
-ExecStartPost=/bin/bash -c 'sleep 3 && __INSTALL_DIR__/cjdns-proxy-server &'
+ExecStartPre=/bin/bash -c '__INSTALL_DIR__/cjdroute < __INSTALL_DIR__/cjdroute.conf'
+ExecStart=/bin/bash -c 'sleep 3 && __INSTALL_DIR__/cjdns-proxy-server'
+ExecStop=/bin/bash -c 'killall cjdroute'
 KillMode=process
 Restart=no
 
diff --git a/scripts/install b/scripts/install
index 897b50a..529acca 100755
--- a/scripts/install
+++ b/scripts/install
@@ -32,7 +32,6 @@ $install_dir/cjdroute --genconf | $install_dir/cjdroute --cleanconf > $install_d
 
 jq '.security[0].setuser = 0' $install_dir/cjdroute.conf > $install_dir/cjdroute.conf.tmp && mv $install_dir/cjdroute.conf.tmp $install_dir/cjdroute.conf
 jq '.security[0].seccomp = 0' $install_dir/cjdroute.conf > $install_dir/cjdroute.conf.tmp && mv $install_dir/cjdroute.conf.tmp $install_dir/cjdroute.conf
-jq '.noBackground = 1' $install_dir/cjdroute.conf > $install_dir/cjdroute.conf.tmp && mv $install_dir/cjdroute.conf.tmp $install_dir/cjdroute.conf
 
 #=================================================
 # UPGRADE PEERS