diff --git a/home.admin/setup.scripts/dialogName.sh b/home.admin/setup.scripts/dialogName.sh
index 248c1205a..eb77ea66d 100644
--- a/home.admin/setup.scripts/dialogName.sh
+++ b/home.admin/setup.scripts/dialogName.sh
@@ -28,4 +28,5 @@ while [ ${#result} -eq 0 ]
   done
 
 # store name in setup state
+sudo sed -i '/^hostname=/d' $SETUPFILE
 echo "hostname=${result}" >> $SETUPFILE
\ No newline at end of file
diff --git a/home.admin/setup.scripts/dialogPasswords.sh b/home.admin/setup.scripts/dialogPasswords.sh
index 1bd8ae30e..48f733a54 100644
--- a/home.admin/setup.scripts/dialogPasswords.sh
+++ b/home.admin/setup.scripts/dialogPasswords.sh
@@ -13,19 +13,26 @@ source $SETUPFILE
 # INPUT PASSWORDS (based on flags from raspiblitz.setup)
 
 # dynamic info string on what passwords need to be changed
-passwordinfo="A" # always so far
+# at the moment its always
+passwordinfo="A"
+echo "A"
 if [ "${setPasswordB}" == "1" ]; then
   passwordinfo = "${passwordinfo}, B"
+  echo "A1"
 fi
+echo "B"
 if [ "${setPasswordC}" == "1" ]; then
   passwordinfo = "${passwordinfo}, C"
+  echo "B1"
 fi
+echo "${passwordinfo}"
+sleep 3
 
 # if passwords are set in a migration situation, use different info text
 if [ "${migrationOS}" == "" ]; then
 
-    # info text on normal setup
-    dialog --backtitle "RaspiBlitz - Setup" --msgbox "RaspiBlitz uses 3 different passwords.
+  # info text on normal setup
+  dialog --backtitle "RaspiBlitz - Setup" --msgbox "RaspiBlitz uses 3 different passwords.
 Referenced as password A, B & C.
 
 PASSWORD A) Main User Password (SSH & WebUI, sudo)
@@ -41,8 +48,8 @@ Write them down & store them in a safe place.
 
 else
 
-    # info text on migration setup
-    dialog --backtitle "RaspiBlitz - Migration Setup" --msgbox "You will need to set new passwords.
+  # info text on migration setup
+  dialog --backtitle "RaspiBlitz - Migration Setup" --msgbox "You will need to set new passwords.
 
 RaspiBlitz works with 3 different passwords:
 PASSWORD A) Main User Password (SSH & WebUI, sudo)
@@ -68,6 +75,7 @@ if [ "${setPasswordA}" == "1" ]; then
   sudo /home/admin/config.scripts/blitz.setpassword.sh x "PASSWORD A - Main User Password" $_temp
   password=$(sudo cat $_temp)
   sudo rm $_temp
+  sudo sed -i '/^passwordA=/d' $SETUPFILE
   echo "passwordA='${password}'" >> $SETUPFILE
   dialog --backtitle "RaspiBlitz - Setup" --msgbox "\nThanks - Password A accepted.\n\nUse this password for future SSH or Web-Admin logins to your RaspiBlitz & for sudo commands." 11 35
 fi
@@ -78,6 +86,7 @@ if [ "${setPasswordB}" == "1" ]; then
   sudo /home/admin/config.scripts/blitz.setpassword.sh x "PASSWORD B - APP Password" $_temp
   password=$(sudo cat $_temp)
   sudo rm $_temp
+  sudo sed -i '/^passwordB=/d' $SETUPFILE
   echo "passwordB='${password}'" >> $SETUPFILE
   dialog --backtitle "RaspiBlitz - Setup" --msgbox "\nThanks - Password B accepted.\n\nUse this password as login for\nadditial Apps & API access." 10 34
 fi
@@ -88,6 +97,7 @@ if [ "${setPasswordC}" == "1" ]; then
   sudo /home/admin/config.scripts/blitz.setpassword.sh x "PASSWORD C - Lightning Wallet Password" $_temp
   password=$(sudo cat $_temp)
   sudo rm $_temp
+  sudo sed -i '/^passwordC=/d' $SETUPFILE
   echo "passwordC='${password}'" >> $SETUPFILE
   dialog --backtitle "RaspiBlitz - Setup" --msgbox "\nThanks - Password C accepted.\n\nAlways use this password to \nunlock your Lightning Wallet." 10 34
 fi