diff --git a/setup.sh b/setup.sh
index ea371a0..6300889 100644
--- a/setup.sh
+++ b/setup.sh
@@ -32,7 +32,7 @@ raidtype=`dialog --no-items --no-cancel --title "Root pool ZFS RAID" --radiolist
 hostname=""; while [ -z "$hostname" ]; do hostname=`dialog --no-cancel --inputbox "Host name/Server name" 8 100 2>&1 >/dev/tty`; done
 nicdevices=""; for nic in $(ip -o link show | awk -F': ' '{print $2}' | grep -v '^lo'); do nicdevices="$nicdevices $nic off"; done
 nics=`dialog --separate-output --no-cancel --no-items --title "Network devices for bridge" --checklist "Select the network devices to be bridged" $height $width ${window}$nicdevices 2>&1 1>/dev/tty`
-rootpassword=`dialog --no-cancel --title "Root password" --passwordbox "Enter root password" $height $width 2>&1 1>/dev/tty`
+rootpassword=`dialog --no-cancel --title "Root password" --insecure --passwordbox "Enter root password" $height $width 2>&1 1>/dev/tty`
 timezone=`dialog --no-cancel --title "Timezone" --inputbox "Enter time zone" $height $width "America/Los_Angeles" 2>&1 1>/dev/tty`
 
 for disk in `echo "$disks"`; do
@@ -107,7 +107,7 @@ echo "Done."
 
 echo ""
 echo "Setting hostname..."
-echo HOSTNAME > /mnt/etc/hostname
+echo "$hostname" > /mnt/etc/hostname
 echo "127.0.1.1 $hostname" >> /mnt/etc/hosts
 echo "Done."