diff --git a/Docker/lofar-base/chuser.sh b/Docker/lofar-base/chuser.sh
index ca90f0e5b1ff617b1bb44c99230bca4085899e1e..fb744213c344a5356929e7cb59ec0c22b9074211 100755
--- a/Docker/lofar-base/chuser.sh
+++ b/Docker/lofar-base/chuser.sh
@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 
 # Configrue user
-export USER=${UID}
+if [ -z "${USER}" ]; then
+  export USER=${UID}
+fi
+
+# Create home directory
 export HOME=/home/${USER}
 mkdir -p $HOME && cd $HOME