diff --git a/daq.sh b/daq.sh
index 8ae040ca11802dd500fd2e34c020cb3174ac134f..86efa6d1b43999a481ca63f9b696d542a6d45553 100755
--- a/daq.sh
+++ b/daq.sh
@@ -7,9 +7,9 @@
 # Author: Carmelo Pellegrino <carmelo.pellegrino@bo.infn.it>
 #
 
-if [ $# -ne 5 ]; then
+if [ $# -ne 6 ]; then
   echo "ERROR:"
-  echo "Syntax: $0 <run_number> <run_start_time> <run_duration_in_sec> <ip of the DAQ server>"
+  echo "Syntax: $0 <run_number> <run_start_time> <run_duration_in_sec> <ip of the DAQ server> <username>"
   exit -1
 fi
 
@@ -17,6 +17,7 @@ RUN_NUMBER=$1
 RUN_START_TIME=$2
 RUN_DURATION=$3
 DAQ_SERVER=$4
+DAQ_USER=$5
 
 SERVER=${DAQ_SERVER} # JLigier for StateMachine
 LOGGER=${DAQ_SERVER} # JLigier for logging
@@ -74,11 +75,11 @@ EOF
 
 cat>driver.txt<<EOF
 
-process  DataQueue/1    $DATAQUEUE   ssh  \$HOST\$  "DataQueue -u \$NAME\$  -H \$SERVER\$  -M \$LOGGER\$  -d $DEBUG -o -a </dev/null >&/dev/null &";
+process  DataQueue/1    $DATAQUEUE   ssh  $DAQ_USER@\$HOST\$  "DataQueue -u \$NAME\$  -H \$SERVER\$  -M \$LOGGER\$  -d $DEBUG -o -a </dev/null >&/dev/null &";
 
-process  JDataFilter/1  $DATAFILTER  ssh  \$HOST\$  "JDataFilter  -u \$NAME\$  -P $PORT  -H \$SERVER\$  -M \$LOGGER\$  -d $DEBUG </dev/null >&/dev/null &";
+process  JDataFilter/1  $DATAFILTER  ssh  $DAQ_USER@\$HOST\$  "JDataFilter  -u \$NAME\$  -P $PORT  -H \$SERVER\$  -M \$LOGGER\$  -d $DEBUG </dev/null >&/dev/null &";
 
-process  JDataWriter    $DATAWRITER  ssh  \$HOST\$  "JDataWriter  -u \$NAME\$  -H \$SERVER\$  -M \$LOGGER\$  -d $DEBUG  </dev/null >&/dev/null &";
+process  JDataWriter    $DATAWRITER  ssh  $DAQ_USER@\$HOST\$  "JDataWriter  -u \$NAME\$  -H \$SERVER\$  -M \$LOGGER\$  -d $DEBUG  </dev/null >&/dev/null &";
 
 enter