diff --git a/attributes/default.rb b/attributes/default.rb
index c7834f2..3d0ffea 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+default['supervisor']['user'] = 'root'
 default['supervisor']['unix_http_server']['chmod'] = '700'
 default['supervisor']['unix_http_server']['chown'] = 'root:root'
 default['supervisor']['inet_port'] = nil
diff --git a/templates/default/debian/supervisor.init.erb b/templates/default/debian/supervisor.init.erb
index 54254d6..bc2e6a9 100644
--- a/templates/default/debian/supervisor.init.erb
+++ b/templates/default/debian/supervisor.init.erb
@@ -140,8 +140,7 @@ case "$1" in
     ;;
   restart)
     echo -n "Restarting $DESC: "
-    start-stop-daemon --stop --quiet --pidfile \
-        /var/run/$NAME.pid --exec $DAEMON
+    start-stop-daemon --stop --quiet --pidfile $PIDFILE
     [ -n "$DODTIME" ] && sleep $DODTIME
     start-stop-daemon --start --quiet --pidfile \
         /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS