Index: etc/rc.subr
===================================================================
--- etc/rc.subr
+++ etc/rc.subr
@@ -954,12 +954,6 @@
 	    _prepend=\$${name}_prepend	_login_class=\${${name}_login_class:-daemon} \
 	    _oomprotect=\$${name}_oomprotect
 
-	if [ -n "$_user" ]; then	# unset $_user if running as that user
-		if [ "$_user" = "$(eval $IDCMD)" ]; then
-			unset _user
-		fi
-	fi
-
 	[ -z "$autoboot" ] && eval $_pidcmd	# determine the pid if necessary
 
 	for _elem in $_keywords; do
@@ -1058,13 +1052,8 @@
 ${_fib:+setfib -F $_fib }\
 ${_env:+env $_env }\
 $command $rc_flags $command_args"
-				if [ -n "$_user" ]; then
-				    _doit="su -m $_user -c 'sh -c \"$_doit\"'"
-				fi
+				_doit="su -l ${_user:-root} -c 'sh -c \"$_doit\"'"
 				if [ -n "$_nice" ]; then
-					if [ -z "$_user" ]; then
-						_doit="sh -c \"$_doit\""
-					fi
 					_doit="nice -n $_nice $_doit"
 				fi
 				if [ -n "$_prepend" ]; then
@@ -1301,9 +1290,7 @@
 	local _cmd
 
 	_cmd="kill -$1 $rc_pid"
-	if [ -n "$_user" ]; then
-		_cmd="su -m ${_user} -c 'sh -c \"${_cmd}\"'"
-	fi
+	_cmd="su -l ${_user:-root} -c 'sh -c \"${_cmd}\"'"
 	echo "$_cmd"
 }