diff --git a/after.sh b/after.sh
index 9e719ac..87e584c 100644
--- a/after.sh
+++ b/after.sh
@@ -59,21 +59,20 @@ EOF
 # Install yay
 # ─────────────────────────────────────
 
-install -d -o "$USERNAME" -g "$USERNAME" /home/tadas/.config/yay
-#pacman -S --needed --noconfirm git base-devel
+install -d -o "$USERNAME" -g "$USERNAME" "/home/$USERNAME/.config/yay"
 
 su - "$USERNAME" <<'EOF'
+set -e
+
+echo "USERNAME=$(whoami)"
+cat /etc/sudoers.d/99-install-script
+
+sudo -n true \
+    && echo "Passwordless sudo works" \
+    || { echo "Passwordless sudo FAILED"; exit 1; }
+
 git clone https://aur.archlinux.org/yay-bin.git
 cd yay-bin
-#
-# LIMIT TESTING
-echo "USERNAME=$USERNAME"
-cat /etc/sudoers.d/99-install-script
-runuser -u "$USERNAME" -- sudo -n true \
-    && echo "Passwordless sudo works" \
-    || echo "Passwordless sudo FAILED"
-#############################################
-
 makepkg -si --noconfirm
 
 # Set up yay to not ask for password multiple times