diff --git a/roles/autofs/files/usercache.csh b/roles/autofs/files/usercache.csh
index 512ce9c..138f485 100644
--- a/roles/autofs/files/usercache.csh
+++ b/roles/autofs/files/usercache.csh
@@ -1,4 +1,11 @@
 if ($uid > 999 && "`/usr/bin/id -gn`" == "`/usr/bin/id -un`") then
+    if ( ! ($?XDG_RUNTIME_DIR) ) then
+        if ( -d "/run/user/${uid}" ) then
+            setenv XDG_RUNTIME_DIR "/run/user/${uid}"
+        else
+            setenv XDG_RUNTIME_DIR "${HOME}"
+        endif
+    endif
     setenv XDG_CACHE_HOME "${XDG_RUNTIME_DIR}/.cache"
     if ( ! -d "${XDG_CACHE_HOME}" ) then
         install -d -m 0700 "${XDG_CACHE_HOME}"
diff --git a/roles/autofs/files/usercache.sh b/roles/autofs/files/usercache.sh
index 4371855..84cd0b4 100644
--- a/roles/autofs/files/usercache.sh
+++ b/roles/autofs/files/usercache.sh
@@ -1,4 +1,12 @@
 if [ $UID -gt 999 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then
+    if [ -z "$XDG_RUNTIME_DIR" ]; then
+        if [ -d "/run/user/${UID}" ]; then
+            XDG_RUNTIME_DIR="/run/user/${UID}"
+        else
+            XDG_RUNTIME_DIR="$HOME"
+        fi
+        export XDG_RUNTIME_DIR
+    fi
     export XDG_CACHE_HOME="$XDG_RUNTIME_DIR/.cache"
     if [ ! -d "$XDG_CACHE_HOME" ] ; then
         install -d -m 0700 "$XDG_CACHE_HOME"