diff --git a/.archlinux/install-scripts/004-postinstall b/.archlinux/install-scripts/004-postinstall
index 766bad3..797f924 100755
--- a/.archlinux/install-scripts/004-postinstall
+++ b/.archlinux/install-scripts/004-postinstall
@@ -25,6 +25,3 @@ echo "%wheel ALL=(ALL) ALL" >> /mnt/etc/sudoers
 
 # Create a new user account with sudo privileges and the fish shell.
 arch-chroot /mnt useradd -m -g users -G wheel -s /usr/bin/fish "$USERNAME"
-
-# Then, set the password equal to the username (change this later).
-echo "$USERNAME:$USERNAME" | chpasswd
diff --git a/.archlinux/install-scripts/install.sh b/.archlinux/install-scripts/install.sh
index 7ea263c..138ce7d 100755
--- a/.archlinux/install-scripts/install.sh
+++ b/.archlinux/install-scripts/install.sh
@@ -29,3 +29,9 @@ echo "Running install scripts..."
 env DISTSIZE="$DISTSIZE" ./001-preinstall
 env HOSTNAME="$HOSTNAME" ./003-configure
 env USERNAME="$USERNAME" ./004-postinstall
+
+echo "Enter a password for the root user..."
+arch-chroot /mnt passwd
+
+echo "Enter a password for $USERNAME..."
+arch-chroot /mnt passwd "$USERNAME"