diff --git a/Docker/lofar-base/chuser.sh b/Docker/lofar-base/chuser.sh
index 53911fb5a0e129ca0714343d147fafa4a1abe6cb..0b034ddec1a5ae94904f896fa45812451cffb525 100755
--- a/Docker/lofar-base/chuser.sh
+++ b/Docker/lofar-base/chuser.sh
@@ -21,7 +21,10 @@ if [ -n "${LUSER}" ]; then
   chown --from=${OLDID} -R ${LUSER}:${LGROUP} /opt
 fi
 
-# Switch to the updated user
+# Update environment for updated user
 export HOME=/home/${USER}
 touch -a $HOME/.bashrc
-sudo -u ${USER} -E -s /bin/bash -c "source $HOME/.bashrc;$*"
+source $HOME/.bashrc
+
+# Use exec to make sure we propagate signals
+exec sudo -u ${USER} -E "$@"