diff --git a/installer.sh b/installer.sh
index d3af984..184dfcc 100644
--- a/installer.sh
+++ b/installer.sh
@@ -38,10 +38,9 @@ if [ ${#passdiaone} -lt 8 ]; then whiptail --ok-button Done --msgbox "Password i
 function PasswordCheck {
 #Checking password
 passdiatwo=$(whiptail --nocancel --passwordbox "Please re-enter your password" 11 82 --title "Config" 3>&1 1>&2 2>&3)
-if [ -z $passdiatwo ]; then PasswordCheck; fi
-if [ $passdiaone != $passdiatwo ]; then whiptail --ok-button Done --msgbox "Password does not match!" 10 30 && PasswordQuest; fi
-password=$passdiaone
-unset passdiaone passdiatwo
+if [ -z $passdiatwo ]; then PasswordCheck; else
+if [ $passdiaone != $passdiatwo ]; then whiptail --ok-button Done --msgbox "Password does not match!" 10 30 && PasswordQuest;else password="$passdiaone"; unset passdiaone passdiatwo; fi
+fi
 }
 
 function LegacyPasswordQuest {
@@ -54,10 +53,9 @@ function LegacyPasswordCheck {
 #Checking password
 echo "Please re-enter your password" 
 read -s passdiatwo
-if [ -z $passdiatwo ]; then LegacyPasswordCheck; fi
-if [ $passdiaone != $passdiatwo ]; then echo "Password does not match!" && LegacyPasswordQuest; fi
-password=$passdiaone
-unset passdiaone passdiatwo
+if [ -z $passdiatwo ]; then LegacyPasswordCheck; else
+if [ $passdiaone != $passdiatwo ]; then echo "Password does not match!" && LegacyPasswordQuest; password="$passdiaone"; unset passdiaone passdiatwo fi
+fi
 }