diff --git a/src/rc.d/sysadm b/src/rc.d/sysadm
index 5ca2a55..25cbb1f 100755
--- a/src/rc.d/sysadm
+++ b/src/rc.d/sysadm
@@ -37,6 +37,7 @@ ssl_keygen()
 sysadm_stop()
 {
   if [ -e "/var/run/sysadm.pid" ] ; then
+    pkill -9 -F /var/run/sysadm-daemon.pid >/dev/null 2>/dev/null
     pkill -9 -F /var/run/sysadm.pid >/dev/null 2>/dev/null
   fi
 }
@@ -48,7 +49,7 @@ sysadm_start()
   ssl_keygen
   echo "Starting sysadm..."
   command="/usr/local/bin/sysadm-server"
-  daemon -r -p /var/run/sysadm.pid $command $flags >/dev/null 2>/dev/null
+  daemon -r -P /var/run/sysadm-daemon.pid -p /var/run/sysadm.pid $command $flags >/dev/null 2>/dev/null
   chmod 744 /var/run/sysadm.pid >/dev/null 2>/dev/null
 }
 
diff --git a/src/rc.d/sysadm-rest b/src/rc.d/sysadm-rest
index ba7abc3..92b2af6 100755
--- a/src/rc.d/sysadm-rest
+++ b/src/rc.d/sysadm-rest
@@ -37,6 +37,7 @@ ssl_keygen()
 sysadm_rest_stop()
 {
   if [ -e "/var/run/sysadm-rest.pid" ] ; then
+    pkill -9 -F /var/run/sysadm-rest-daemon.pid >/dev/null 2>/dev/null
     pkill -9 -F /var/run/sysadm-rest.pid >/dev/null 2>/dev/null
   fi
 }
@@ -48,7 +49,7 @@ sysadm_rest_start()
   ssl_keygen
   echo "Starting sysadm (REST)..."
   command="/usr/local/bin/sysadm-server"
-  daemon -r -p /var/run/sysadm-rest.pid $command $flags >/dev/null 2>/dev/null
+  daemon -r -P /var/run/sysadm-rest-daemon.pid -p /var/run/sysadm-rest.pid $command $flags >/dev/null 2>/dev/null
   chmod 744 /var/run/sysadm-rest.pid >/dev/null 2>/dev/null
 }