diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index df852b27..f5c5f4ad 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -187,15 +187,26 @@ function view_or_change_passwords {
 
     icann_address=$(get_app_icann_address "$app_name")
     onion_address=$(get_app_onion_address "${SELECTED_APP}")
+
+    titlestr=$"View or Change Password"
     if [ ${#onion_address} -gt 0 ]; then
         viewstr=$"${SELECTED_APP} password for ${SELECTED_USERNAME} on $icann_address or $onion_address\n\nCopy or change it if you wish."
     else
         viewstr=$"${SELECTED_APP} password for ${SELECTED_USERNAME} on $icann_address\n\nCopy or change it if you wish."
     fi
 
+    if [ -f /root/.nostore ]; then
+        titlestr=$"Change Password"
+        if [ ${#onion_address} -gt 0 ]; then
+            viewstr=$"Change the ${SELECTED_APP} password for ${SELECTED_USERNAME} on $icann_address or $onion_address."
+        else
+            viewstr=$"Change the ${SELECTED_APP} password for ${SELECTED_USERNAME} on $icann_address."
+        fi
+    fi
+
     data=$(tempfile 2>/dev/null)
     trap "rm -f $data" 0 1 2 5 15
-    dialog --title $"View or Change Password" \
+    dialog --title "$titlestr" \
            --backtitle $"Freedombone Control Panel" \
            --inputbox "$viewstr" 12 60 "$CURR_PASSWORD" 2>$data
     sel=$?