diff --git a/examples/simple_repeater/MyMesh.h b/examples/simple_repeater/MyMesh.h
index 6cc179d8..99394a47 100644
--- a/examples/simple_repeater/MyMesh.h
+++ b/examples/simple_repeater/MyMesh.h
@@ -508,6 +508,8 @@ public:
   }
   void onConfigBatchEnd() override;
   bool onInitialSetupComplete() override {
+    // The password command does not report its save; make it durable first.
+    if (!_cli.savePrefs(_fs)) return false;
     MQTTPrefs* obs = _cli.getObserverPrefs();
     obs->network_setup_complete = 1;
     if (_cli.saveObserverPrefs(_fs)) return true;
diff --git a/examples/simple_room_server/MyMesh.h b/examples/simple_room_server/MyMesh.h
index f5e0be7e..594450f8 100644
--- a/examples/simple_room_server/MyMesh.h
+++ b/examples/simple_room_server/MyMesh.h
@@ -498,6 +498,8 @@ public:
   }
   void onConfigBatchEnd() override;
   bool onInitialSetupComplete() override {
+    // The password command does not report its save; make it durable first.
+    if (!_cli.savePrefs(_fs)) return false;
     MQTTPrefs* obs = _cli.getObserverPrefs();
     obs->network_setup_complete = 1;
     if (_cli.saveObserverPrefs(_fs)) return true;