diff --git a/run-config.sh b/run-config.sh
index 49f267f3cc1d380ac1dec95612a7581653167b15..66e918ff7e8fa6c553d213a85fb9cee3382bd647 100755
--- a/run-config.sh
+++ b/run-config.sh
@@ -82,12 +82,12 @@ inep="--inep=${inep}"
 mac="--mac=${mac}"
 
 # Execution
-if test $# -gt 1; then
+if test $# -ne 1; then
     echo "Run.sh call: wrong number of parameters ($#)." \
          >> ${dirname}/run.log
     exit 101
-elif test $# -eq 0; then
-    ${bindir}/client ${url} ${inep} ${mac} ${proxy} >> ${dirname}/run.log
+elif [[ $1 == "--inventory" ]]; then
+    ${bindir}/client $1 ${url} ${inep} ${proxy} >> ${dirname}/run.log
 elif [[ $1 == "--update" ]]; then
     retstr=$(${bindir}/client $1 ${url} ${proxy})
     retval=$?
@@ -95,8 +95,6 @@ elif [[ $1 == "--update" ]]; then
         echo "$retstr" | tee -a ${dirname}/run.log
     fi
     exit $retval
-elif [[ $1 == "--inventory" ]]; then
-    ${bindir}/client $1 ${url} ${inep} ${proxy} >> ${dirname}/run.log
 else
     echo "Run.sh call: wrong parameter (\"$1\")." >> ${dirname}/run.log
     exit 102