diff --git a/scripts/linux-setup_zsh.sh b/scripts/linux-setup_zsh.sh
index 9dd3182..45a5c3f 100755
--- a/scripts/linux-setup_zsh.sh
+++ b/scripts/linux-setup_zsh.sh
@@ -18,8 +18,8 @@ else
     fi
 fi
 
-echo "Changing default shell to Zsh for user ${SUDO_USER:-$USER}..."
+echo "Changing default shell to Zsh for user $(whoami)..."
 zsh_path=$(command -v zsh)
-sudo chsh -s "$zsh_path" "${SUDO_USER:-$USER}"
+sudo chsh -s "$zsh_path" "$(whoami)"
 
 echo "Zsh installation and setup complete. Please log out and log back in for changes to take effect."