diff --git a/run-config.sh b/run-config.sh
index eb65ae374177389e3dcbcabe47ae8e8393d3fbaa..2cf0002f1ea405004ea975ee5bb99ff0e6fa732a 100755
--- a/run-config.sh
+++ b/run-config.sh
@@ -66,19 +66,20 @@ date +"%F %T" >> ${dirname}/run.log
 if test $# -gt 1; then
     echo "Run.sh call: wrong number of parameters ($#)." >> run.log
 elif test $# -eq 0; then
-    ${bindir}/client ${url} ${inep} ${mac} ${phost} ${pport} ${puid} \
-                     ${ppasswd} >> ${dirname}/run.log 2>&1
+    ${bindir}/client "${url}" "${inep}" "${mac}" "${phost}" "${pport}" \
+                     "${puid}" "${ppasswd}" >> ${dirname}/run.log 2>&1
 elif [[ $1 == "--update" ]]; then
-    retstr=$(${bindir}/client $1 ${url} ${inep} ${mac} ${phost} ${pport} \
-                                 ${puid} ${ppasswd} 2>> ${dirname}/run.log)
+    retstr=$(${bindir}/client $1 "${url}" "${inep}" "${mac}" "${phost}" \
+                                 "${pport}" "${puid}" "${ppasswd}" \
+                                            2>> ${dirname}/run.log)
     retval=$?
     if test ${retval} -eq 4; then
         echo "$retstr" | tee -a ${dirname}/run.log
     fi
     exit $retval
 elif [[ $1 == "--inventory" ]]; then
-    ${bindir}/client $1 ${url} ${inep} ${mac} ${phost} ${pport} ${puid} \
-                        ${ppasswd} >> ${dirname}/run.log 2>&1
+    ${bindir}/client "$1" "${url}" "${inep}" "${mac}" "${phost}" "${pport}" \
+                          "${puid}" "${ppasswd}" >> ${dirname}/run.log 2>&1
 else
     echo "Run.sh call: wrong parameter (\"$1\")." >> run.log
 fi