diff --git a/installer.sh b/installer.sh
index abd4fbe..27b1614 100644
--- a/installer.sh
+++ b/installer.sh
@@ -67,7 +67,7 @@ fi
 }
 
 function PasswordQuest {
-passdiaone=$(whiptail --nocancel --passwordbox "Please enter your password (should contain at least 2 digits and 6 characters)" 11 82 --title "Config" 3>&1 1>&2 2>&3)
+passdiaone=$(whiptail --nocancel --passwordbox "Please enter your password (Requires 8 chars, uper & lower case, special and numerical)" 11 91 --title "Config" 3>&1 1>&2 2>&3)
 if [ -z $passdiaone ]; then PasswordQuest; fi
 if [[ ${#passdiaone} -ge 8 && "$passdiaone" == *[[:lower:]]* && "$passdiaone" == *[[:upper:]]* && "$passdiaone" == *[0-9]* && "$passdiaone" == *['!'@#%^\&*()_+]* ]]; then
  PasswordCheck
@@ -79,9 +79,10 @@ 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; else
-if [ $passdiaone != $passdiatwo ]; then whiptail --ok-button Done --msgbox " Password does not match!" 10 30 && PasswordQuest;else password="$passdiaone"; unset passdiaone passdiatwo; fi
+if [ $passdiaone != $passdiatwo ]; then whiptail --ok-button Done --msgbox " Password does not match!" 10 30 && PasswordQuest;else password="$passdiaone"; fi
 fi
 password="$passdiatwo"
+unset passdiaone passdiatwo
 }
 
 function LegacyPasswordQuest {
@@ -100,9 +101,10 @@ function LegacyPasswordCheck {
 echo "Please re-enter your password"
 read -s passdiatwo
 if [ -z $passdiatwo ]; then LegacyPasswordCheck; else
-if [ $passdiaone != $passdiatwo ]; then echo "Password does not match!" && LegacyPasswordQuest; password="$passdiaone"; unset passdiaone passdiatwo; fi
+if [ $passdiaone != $passdiatwo ]; then echo "Password does not match!" && LegacyPasswordQuest; password="$passdiaone"; fi
 fi
 password="$passdiatwo"
+unset passdiaone passdiatwo
 }