diff --git a/utils/novnc_proxy b/utils/novnc_proxy
index ea3ea706c..ec727e994 100755
--- a/utils/novnc_proxy
+++ b/utils/novnc_proxy
@@ -93,14 +93,14 @@ while [ "$*" ]; do
     --web)     WEB="${OPTARG}"; shift            ;;
     --ssl-only) SSLONLY="--ssl-only"             ;;
     --file-only) FILEONLY_ARG="--file-only"      ;;
-    --record) RECORD_ARG="--record ${OPTARG}"; shift ;;
-    --syslog) SYSLOG_ARG="--syslog ${OPTARG}"; shift ;;
+    --record) RECORD_ARG="--record '${OPTARG}'"; shift ;;
+    --syslog) SYSLOG_ARG="--syslog '${OPTARG}'"; shift ;;
     --heartbeat) HEARTBEAT_ARG="--heartbeat ${OPTARG}"; shift ;;
     --idle-timeout) IDLETIMEOUT_ARG="--idle-timeout ${OPTARG}"; shift ;;
     --timeout) TIMEOUT_ARG="--timeout ${OPTARG}"; shift ;;
     --web-auth) WEBAUTH_ARG="--web-auth"                ;;
-    --auth-plugin) AUTHPLUGIN_ARG="--auth-plugin ${OPTARG}"; shift ;;
-    --auth-source) AUTHSOURCE_ARG="--auth-source ${OPTARG}"; shift ;;
+    --auth-plugin) AUTHPLUGIN_ARG="--auth-plugin '${OPTARG}'"; shift ;;
+    --auth-source) AUTHSOURCE_ARG="--auth-source '${OPTARG}'"; shift ;;
     -h|--help) usage                              ;;
     -*) usage "Unknown chrooter option: ${param}" ;;
     *) break                                      ;;
@@ -192,8 +192,8 @@ else
 fi
 
 echo "Starting webserver and WebSockets proxy on port ${PORT}"
-#${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
-${WEBSOCKIFY} ${SYSLOG_ARG} ${SSLONLY} ${FILEONLY_ARG} --web ${WEB} ${CERT:+--cert ${CERT}} ${KEY:+--key ${KEY}} ${PORT} ${VNC_DEST} ${HEARTBEAT_ARG} ${IDLETIMEOUT_ARG} ${RECORD_ARG} ${TIMEOUT_ARG} ${WEBAUTH_ARG} ${AUTHPLUGIN_ARG} ${AUTHSOURCE_ARG} &
+#${HERE}/websockify --web ${WEB:+"${WEB}"} ${CERT:+--cert "${CERT}"} ${PORT} ${VNC_DEST} &
+${WEBSOCKIFY} ${SYSLOG_ARG} ${SSLONLY} ${FILEONLY_ARG} --web="${WEB}" ${CERT:+--cert "${CERT}"} ${KEY:+--key "${KEY}"} ${PORT} ${VNC_DEST} ${HEARTBEAT_ARG} ${IDLETIMEOUT_ARG} ${RECORD_ARG} ${TIMEOUT_ARG} ${WEBAUTH_ARG} ${AUTHPLUGIN_ARG} ${AUTHSOURCE_ARG} &
 proxy_pid="$!"
 sleep 1
 if [ -z "$proxy_pid" ] || ! ps -eo pid= | grep -w "$proxy_pid" > /dev/null; then