diff --git a/after.sh b/after.sh
index 1423435..14d0c46 100644
--- a/after.sh
+++ b/after.sh
@@ -18,8 +18,8 @@ USER_HOME="/home/$USERNAME"
 # Temporarily enable passwordless sudo
 # ─────────────────────────────────────
 
-SUDOERS_FILE="/etc/sudoers.d/00_tadas"
-SUDOERS_BACKUP="/etc/sudoers.d/00_tadas.backup"
+SUDOERS_FILE="/etc/sudoers.d/00_$USERNAME"
+SUDOERS_BACKUP="${SUDOERS_FILE}.backup"
 
 cp "$SUDOERS_FILE" "$SUDOERS_BACKUP"
 
@@ -69,21 +69,12 @@ EOF
 install -d -o "$USERNAME" -g "$USERNAME" "/home/$USERNAME/.config/yay"
 
 su - "$USERNAME" <<'EOF'
-set -e
-
-sudo -k
-sudo -n true || {
-    echo "ERROR: Passwordless sudo is not working."
-    exit 1
-}
-echo "Passwordless sudo works."
 
 git clone https://aur.archlinux.org/yay-bin.git
 cd yay-bin
 makepkg -si --noconfirm
 
-# Set up yay to not ask for password multiple times
-#sudo mkdir -p ~/.config/yay
+# Set up yay to not ask for password multiple times during installation / upgrading later
 yay --sudoloop --save
 
 # Instal AUR packages