diff --git a/EtcFiles/shadowarch b/EtcFiles/shadowarch
index c71090f..943689e 100644
--- a/EtcFiles/shadowarch
+++ b/EtcFiles/shadowarch
@@ -60,9 +60,13 @@ if [ "$answer" != "YES" ]; then
     exit 1;
 fi
 
+# Sync the keys
+pacman-key --init
+pacman-key --populate
+pacman -Sy archlinux-keyring
+
 umount /mnt/boot; umount /mnt
 
-pacman -Syy
 if [ -z "$nodiskbuild" ]; then
     header Allocating space
     dd if=/dev/zero of="$disk" bs=1M count=1000
@@ -192,12 +196,13 @@ fi
 
 # Set password
 header Set new root passphrase and depriviledged user '(depriv)' password.
-arch-chroot /mnt useradd depriv
+arch-chroot /mnt useradd -m depriv
 arch-chroot /mnt passwd
 arch-chroot /mnt passwd depriv
 
 # Set SSH host keys
 arch-chroot /mnt ssh-keygen -A
+arch-chroot /mnt systemctl enable sshd
 
 # Set hostname
 header Set hostname