diff --git a/shell-integration/ssh/bootstrap.sh b/shell-integration/ssh/bootstrap.sh
index d02ed4a42..7f349be62 100644
--- a/shell-integration/ssh/bootstrap.sh
+++ b/shell-integration/ssh/bootstrap.sh
@@ -171,6 +171,7 @@ hostname="$HOSTNAME"
 # ensure $HOME is set
 [ -z "$HOME" ] && HOME=~
 # ensure $USER is set
+[ -z "$USER" ] && USER="$LOGNAME"
 [ -z "$USER" ] && USER="$(command whoami 2> /dev/null)"
 
 leading_data=""