diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 4a41b98..25d0d2d 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -272,13 +272,20 @@ boolean WiFiManager::autoConnect(char const *apName, char const *apPassword) {
   DEBUG_WM(F("AutoConnect"));
   #endif
 
+  // sethostname before wifi ready
+  // https://github.com/tzapu/WiFiManager/issues/1403
+  #ifdef ESP32
+  if(_hostname != ""){
+    setupHostname(false);
+  }
+  #endif
+
   #ifdef ESP32
   if(WiFi.getMode() != WIFI_STA){
     WiFi.mode(WIFI_STA);
   }
   #endif
 
-
   if(getWiFiIsSaved()){
      _startconn = millis();
     _begin();
@@ -287,7 +294,7 @@ boolean WiFiManager::autoConnect(char const *apName, char const *apPassword) {
     // https://github.com/tzapu/WiFiManager/issues/1403
     #ifdef ESP32
     if(_hostname != ""){
-      setupHostname(true);
+      setupHostname(false);
     }
     #endif
 
diff --git a/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino b/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino
index e627b06..920d9ba 100644
--- a/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino
+++ b/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino
@@ -223,7 +223,7 @@ void setup() {
 
   // set Hostname
 
-  // wm.setHostname(("WM_"+wm.getDefaultAPName()).c_str());
+  wm.setHostname(("WM_"+wm.getDefaultAPName()).c_str());
   // wm.setHostname("WM_RANDO_1234");
 
   // set custom channel