Index: /trunk/src/VBox/Installer/darwin/VirtualBox/VBoxAutostartDarwin.sh
===================================================================
--- /trunk/src/VBox/Installer/darwin/VirtualBox/VBoxAutostartDarwin.sh	(revision 88526)
+++ /trunk/src/VBox/Installer/darwin/VirtualBox/VBoxAutostartDarwin.sh	(revision 88527)
@@ -24,6 +24,6 @@
     for user in `dscl . -list /Users`
     do
-        HOMEDIR=`dscl . -read /Users/${user} | grep NFSHomeDirectory | sed 's/NFSHomeDirectory: //g'`
-        USERSHELL=`dscl . -read /Users/${user} | grep UserShell | sed 's/UserShell: //g'`
+        HOMEDIR=`dscl . -read /Users/"${user}" NFSHomeDirectory | sed 's/NFSHomeDirectory: //g'`
+        USERSHELL=`dscl . -read /Users/"${user}" UserShell | sed 's/UserShell: //g'`
 
         # Check for known home directories and shells for daemons
@@ -37,9 +37,9 @@
             start)
                 # Start the daemon
-                su ${user} -c "/Applications/VirtualBox.app/Contents/MacOS/VBoxAutostart --quiet --start --background --config ${CONFIG}"
+                su "${user}" -c "/Applications/VirtualBox.app/Contents/MacOS/VBoxAutostart --quiet --start --background --config ${CONFIG}"
                 ;;
             stop)
-                # Start the daemon
-                su ${user} -c "/Applications/VirtualBox.app/Contents/MacOS/VBoxAutostart --quiet --stop --config ${CONFIG}"
+                # Stop the daemon
+                su "${user}" -c "/Applications/VirtualBox.app/Contents/MacOS/VBoxAutostart --quiet --stop --config ${CONFIG}"
                 ;;
                *)