diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 9c1d4c6..d60d376 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -104,7 +104,7 @@ WiFiManager::~WiFiManager() {
 
 // AUTOCONNECT
 boolean WiFiManager::autoConnect() {
-  String ssid = "ESP" + String(WIFI_getChipId());
+  String ssid = _wifissidprefix + "_" + String(WIFI_getChipId());
   return autoConnect(ssid.c_str(), NULL);
 }
 
@@ -236,7 +236,7 @@ void WiFiManager::setupConfigPortal() {
 }
 
 boolean WiFiManager::startConfigPortal() {
-  String ssid = "ESP" + String(WIFI_getChipId());
+  String ssid = _wifissidprefix + "_" + String(WIFI_getChipId());  
   return startConfigPortal(ssid.c_str(), NULL);
 }