diff --git a/mastersetup.bash b/mastersetup.bash
index a5415cd..ceb02b9 100644
--- a/mastersetup.bash
+++ b/mastersetup.bash
@@ -67,8 +67,15 @@ sudo apt install linux-xanmod-x64v3 -y
 
 # Homebrew
 echo "Installing Homebrew..."
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh) --prefix=/opt/homebrew"
-echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.bashrc
+if [[ -z "$SUDO_USER" ]]; then
+    echo "Error: Script must be run with sudo by a non-root user (SUDO_USER not set)" >&2
+    exit 1
+fi
+# Run Homebrew installer as the original user
+sudo -u "$SUDO_USER" /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh) --prefix=/opt/homebrew"
+# Add Homebrew to the user's .bashrc
+echo "eval \"\$(/opt/homebrew/bin/brew shellenv)\"" | sudo -u "$SUDO_USER" tee -a "/home/$SUDO_USER/.bashrc" > /dev/null
+# Ensure Homebrew is available in the current session
 eval "$(/opt/homebrew/bin/brew shellenv)"
 
 # Pacstall