diff --git a/iiab-upgrade b/iiab-upgrade
index adcd4eec..dd0b00f2 100755
--- a/iiab-upgrade
+++ b/iiab-upgrade
@@ -128,10 +128,16 @@ fi
 
 # B. Ask for password change if pi/raspberry default remains
 if check_user_pwd "pi" "raspberry"; then
-    echo -e "\n\nRaspberry Pi's are COMPROMISED often if the default password is not changed!\n"
-    echo -n "What password do you want for GNU/Linux user 'pi' ? "
-    read -t 5 ans < /dev/tty    # Whines but doesn't change password if [Enter]
-    echo pi:"$ans" | chpasswd || true    # Overrides 'set -e'
+    if [ $INTERACTIVE == 1 ]; then
+        whiptail --msgbox "\
+Raspberry Pi's are COMPROMISED often if the default password is not changed!
+What password do you want for GNU/Linux user 'pi' ?
+press [Enter] 3 times for no change \
+" 20 60 1
+        passwd pi &&
+        whiptail --msgbox "done" 20 60 1
+        #chpasswd || true    # Overrides 'set -e'
+    fi
 fi
 
 # C. Create user 'iiab-admin' as nec, with default password
@@ -143,13 +149,15 @@ fi
 # D. Ask for password change if iiab-admin/g0adm1n default remains
 if check_user_pwd "iiab-admin" "g0adm1n"; then
     echo -e "\n\nUser 'iiab-admin' retains default password 'g0adm1n' per http://FAQ.IIAB.IO\n"
-
     echo -e "This is for login to Internet-in-a-Box's Admin Console (http://box.lan/admin)\n"
     if [ $INTERACTIVE == 1 ]; then
-        echo -n "What password do you want for GNU/Linux user 'iiab-admin' ? "
-        echo -n "press [Enter] for no change"
-        read -t 15 ans < /dev/tty    # Whines but doesn't change password if [Enter]
-        echo iiab-admin:"$ans" | chpasswd || true    # Overrides 'set -e'
+        whiptail --msgbox "\
+What password do you want for GNU/Linux user 'iiab-admin' ?
+press [Enter] 3 times for no change /
+" 20 60 1
+        passwd iiab-admin &&
+        whiptail --msgbox "done" 20 60 1
+        #chpasswd  || true    # Overrides 'set -e'
     fi
 fi