diff --git a/setup/archbaseos-guided-install.sh b/setup/archbaseos-guided-install.sh
index 757a6e4..b12ea4f 100755
--- a/setup/archbaseos-guided-install.sh
+++ b/setup/archbaseos-guided-install.sh
@@ -163,8 +163,16 @@ hwclock --systohc
 echo "$HOSTNAME" > /etc/hostname
 systemctl enable NetworkManager
 
+# Populate /etc/skel before user creation so useradd -m copies everything
+echo "Cloning dotfiles into /etc/skel..."
+git clone https://git.abdelbaki.eu/The_miro/Dotfiles.git /etc/skel/Dotfiles \
+    || echo "Warning: dotfiles clone failed — clone manually after first boot."
+
+mkdir -p /etc/skel/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos}
+
 useradd -m -G wheel -s /bin/zsh "$USERNAME"
 echo "$USERNAME:$USERPASS" | chpasswd
+chown -R "$USERNAME:$USERNAME" "/home/$USERNAME"
 
 echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers
 
@@ -197,10 +205,6 @@ if [[ "$ENABLE_FIDO_USER" == "YES" ]]; then
     echo "auth required pam_u2f.so" >> /etc/pam.d/system-auth
 fi
 
-echo "Cloning dotfiles..."
-git clone https://git.abdelbaki.eu/The_miro/Dotfiles.git /home/$USERNAME/Dotfiles \
-    && chown -R $USERNAME:$USERNAME /home/$USERNAME/Dotfiles \
-    || echo "Warning: dotfiles clone failed — clone manually after first boot."
 
 EOF