diff --git a/pointer/driver/install.sh b/pointer/driver/install.sh
index 95bef34..b781fd8 100755
--- a/pointer/driver/install.sh
+++ b/pointer/driver/install.sh
@@ -12,7 +12,7 @@ root=$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)
 . "$root/scripts/_env.sh"
 frame="$root/scripts/frame.sh"
 src=$FRAME_REPO/pointer/driver
-dest=/home/steamos/.local/share/frametop/ft_pointer
+dest='$HOME/.local/share/frametop/ft_pointer'  # expanded on the Frame, in the commands below
 reg='/opt/steamvr/bin/linuxarm64/vrpathreg'
 
 case ${1:-install} in
diff --git a/session/remote-desktop.sh b/session/remote-desktop.sh
index bd4a85b..99082db 100755
--- a/session/remote-desktop.sh
+++ b/session/remote-desktop.sh
@@ -16,7 +16,7 @@ mkdir -p -m 0700 "$creds"
 # takes it only on its command line, which other local users can read while it runs.
 (umask 077; head -c 24 /dev/urandom | base64 | tr -d '/+=' | cut -c1-20 > "$creds/password")
 if [ ! -s "$creds/cert.pem" ]; then
-  (umask 077; openssl req -x509 -newkey rsa:2048 -nodes -days 3650 -subj /CN=steam-frame \
+  (umask 077; openssl req -x509 -newkey rsa:2048 -nodes -days 3650 -subj "/CN=$(hostname)" \
     -keyout "$creds/key.pem" -out "$creds/cert.pem" 2>/dev/null)
 fi
 
@@ -30,5 +30,5 @@ done
 export XDG_RUNTIME_DIR=/run/user/$(id -u)
 exec ~/.local/bin/distrobox enter dev -- env XDG_RUNTIME_DIR="$runtime" WAYLAND_DISPLAY=wayland-0 QT_QPA_PLATFORM=wayland \
   krdpserver --plasma --address 127.0.0.1 --port "$port" \
-  -u steamos -p "$(cat "$creds/password")" \
+  -u "$(id -un)" -p "$(cat "$creds/password")" \
   --certificate "$creds/cert.pem" --certificate-key "$creds/key.pem"
diff --git a/session/vnc-bridge.sh b/session/vnc-bridge.sh
index 5dcf7fc..166fd82 100755
--- a/session/vnc-bridge.sh
+++ b/session/vnc-bridge.sh
@@ -75,7 +75,7 @@ while kill -0 $xvnc 2>/dev/null; do
       xrandr --addmode VNC-0 "$size" 2>/dev/null || true
       xrandr --fb "$size" --output VNC-0 --mode "$size"
     fi
-    xfreerdp /v:127.0.0.1:"$rdp_port" /u:steamos /p:"$(cat "$creds/password")" \
+    xfreerdp /v:127.0.0.1:"$rdp_port" /u:"$(id -un)" /p:"$(cat "$creds/password")" \
       /cert:ignore /size:"${ww}x${wh}" -decorations +clipboard >/dev/null 2>&1 &
     rdp=$!
     # FreeRDP takes no negative position, so move its window once it is up.