diff --git a/scripts/0-install.sh b/scripts/0-install.sh
index bb8d60f..ba681ef 100644
--- a/scripts/0-install.sh
+++ b/scripts/0-install.sh
@@ -21,16 +21,13 @@ case $yesno in
 esac
 # Get user credentials
 read -p "Please enter a username " username
-read -p "Please enter a password " password
-read -p "Please re-enter the password " passwordconfirm
+read -rsp "Please enter a password " password
+read -rsp "Please re-enter the password " passwordconfirm
 if [[ "$password" == "$password2" ]]; then
     export USERNAME = $username
     export PASSWORD = $password
     echo "Credentials saved"
 fi
-# Set hostname, timezone and keyboard mapping
-# We don't need to prompt for these since they will rarely change
-export HOSTNAME="archlinux"
 # Run pacstrap and install base packages
 pacstrap -i /mnt base base-devel linux linux-firmware linux-headers intel-ucode git openssh rsync networkmanager grub efibootmgr dosfstools os-prober nano dkms dbus-broker-units mkinitcpio iptables-nft
 # Create the /boot/efi directory and mount the EFI partition to it
@@ -70,7 +67,7 @@ locale-gen
 pacman -S --noconfirm hunspell-en_gb
 ln -sf /usr/share/zoneinfo/Europe/London /etc/localtime
 hwclock --systohc
-locale-gen
 echo LANG=en_GB.UTF-8 > /etc/locale.conf
 echo "KEYMAP=uk" > /etc/vconsole.conf
+echo archlinux > /etc/hostname
 sh /buildscripts/1-root-config.sh
\ No newline at end of file