diff --git a/run/scripts/start b/run/scripts/start
index d9912d1a11a0853208ccf926ee2f8cc8d02b7619..857beb7386389e707f8a5af52f258e9c9d4ede96 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -38,8 +38,6 @@ function startContainer {
     else
       start_params=(
         --hostname ${COMPOSE_PROJECT_NAME}-l3d
-        --user ${USERID}:${GROUPID}
-        --group-add ${GROUPIDS// / --group-add }
         --env L3DVERSION=${L3DVERSION}
         --env L3DSHELL=${L3DSHELL}
         --env HOME=/home/${USERNAME}
@@ -56,16 +54,19 @@ function startContainer {
       )
       if [[ ${L3DHOSTOS} != Darwin ]]; then
         start_params+=(
+          --user ${USERID}:${GROUPID}
+          --group-add ${GROUPIDS// / --group-add }
           --volume /etc/group:/etc/group:ro
           --volume /etc/passwd:/etc/passwd:ro
           --volume /etc/shadow:/etc/shadow:ro
           --volume /etc/sudoers:/etc/sudoers:ro
           --volume /etc/sudoers.d:/etc/sudoers.d:ro
         )
-      else
-        start_params+=(
-          --volume ${HOMEDIR}/.passwd:/etc/passwd:ro
-        )
+      # else
+        # (see #62) Disabled for now.
+        #start_params+=(
+        #  --volume ${HOMEDIR}/.passwd:/etc/passwd:ro
+        #)
       fi
       docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
         "${start_params[@]}" \
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index 9f5860ad256eea7ef5cf742275b73a1829f5ad26..03ba4fb136cb8aba2118a3a7b7c58184b02e2925 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -17,11 +17,13 @@ case "${L3DHOSTOS}" in
       else
         # This works on MacOS when coreutils is installed.
         SCRIPTPATH="$(dirname "$(greadlink -f "$0")")"
-        L3DDOCKERHOST="$(dirname "$(greadlink -f "/var/run/docker.sock")")/docker.sock"
+        # (see #62) L3DDOCKERHOST="$(dirname "$(greadlink -f "/var/run/docker.sock")")/docker.sock"
       fi
       GROUPID=1
-      # Write a fake passwd file which will later be mounted into containers.
-      echo "${USERNAME}:x:${USERID}:${GROUPID}:${USERNAME},,,:/home/${USERNAME}:${L3DSHELL}" >${HOME}/.passwd
+      # (see #62) Write a fake passwd file which will later be mounted into containers.
+      # echo "${USERNAME}:x:${USERID}:${GROUPID}:${USERNAME},,,:/home/${USERNAME}:${L3DSHELL}" >${HOME}/.passwd
+      USERNAME=root
+
       # This variable is used to access the ssh agent on MacOS.
       SSHAUTHMAGICPATH="/run/host-services/ssh-auth.sock"
       SSHAUTH=${SSHAUTHMAGICPATH}