diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 08d8bca..91263d3 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -1816,18 +1816,20 @@ void WiFiManager::handleInfo() {
       F("memsmeter"),
       F("lastreset"),
       F("wifihead"),
-      F("apip"),
-      F("apmac"),
-      F("apssid"),
-      F("apbssid"),
+      F("conx"),
+      F("stassid"),
       F("staip"),
       F("stagw"),
       F("stasub"),
       F("dnss"),
       F("host"),
       F("stamac"),
-      F("conx"),
       F("autoconx")
+      F("wifiaphead"),
+      F("apssid"),
+      F("apip"),
+      F("apbssid"),
+      F("apmac"),
     };
 
   #elif defined(ESP32)
@@ -1847,18 +1849,20 @@ void WiFiManager::handleInfo() {
       F("memsmeter"),      
       F("lastreset"),
       F("wifihead"),
-      F("apip"),
-      F("apmac"),
-      F("aphost"),
-      F("apssid"),
-      F("apbssid"),
+      F("conx"),
+      F("stassid"),
       F("staip"),
       F("stagw"),
       F("stasub"),
       F("dnss"),
       F("host"),
       F("stamac"),
-      F("conx"),
+      F("apssid"),
+      F("wifiaphead"),
+      F("apip"),
+      F("apmac"),
+      F("aphost"),
+      F("apbssid"),
       // F("temp")
     };
   #endif
@@ -2019,12 +2023,21 @@ String WiFiManager::getInfoData(String id){
   #endif
   else if(id==F("apssid")){
     p = FPSTR(HTTP_INFO_apssid);
-    p.replace(FPSTR(T_1),htmlEntities((String)WiFi_SSID()));
+    p.replace(FPSTR(T_1),htmlEntities(WiFi.softAPSSID()));
   }
   else if(id==F("apbssid")){
     p = FPSTR(HTTP_INFO_apbssid);
     p.replace(FPSTR(T_1),(String)WiFi.BSSIDstr());
   }
+  // softAPgetHostname // esp32
+  // softAPSubnetCIDR
+  // softAPNetworkID
+  // softAPBroadcastIP
+  // 
+  else if(id==F("stassid")){
+    p = FPSTR(HTTP_INFO_stassid);
+    p.replace(FPSTR(T_1),htmlEntities((String)WiFi_SSID()));
+  }
   else if(id==F("staip")){
     p = FPSTR(HTTP_INFO_staip);
     p.replace(FPSTR(T_1),WiFi.localIP().toString());
diff --git a/strings_en.h b/strings_en.h
index 995cec6..18094a3 100644
--- a/strings_en.h
+++ b/strings_en.h
@@ -190,8 +190,9 @@ const char HTTP_INFO_sdkver[]     PROGMEM = "<dt>SDK Version</dt><dd>{1}</dd>";
 const char HTTP_INFO_cpufreq[]    PROGMEM = "<dt>CPU Frequency</dt><dd>{1}MHz</dd>";
 const char HTTP_INFO_apip[]       PROGMEM = "<dt>Access Point IP</dt><dd>{1}</dd>";
 const char HTTP_INFO_apmac[]      PROGMEM = "<dt>Access Point MAC</dt><dd>{1}</dd>";
-const char HTTP_INFO_apssid[]     PROGMEM = "<dt>SSID</dt><dd>{1}</dd>";
+const char HTTP_INFO_apssid[]     PROGMEM = "<dt>Access Point SSID</dt><dd>{1}</dd>";
 const char HTTP_INFO_apbssid[]    PROGMEM = "<dt>BSSID</dt><dd>{1}</dd>";
+const char HTTP_INFO_stassid[]    PROGMEM = "<dt>Station SSID</dt><dd>{1}</dd>";
 const char HTTP_INFO_staip[]      PROGMEM = "<dt>Station IP</dt><dd>{1}</dd>";
 const char HTTP_INFO_stagw[]      PROGMEM = "<dt>Station Gateway</dt><dd>{1}</dd>";
 const char HTTP_INFO_stasub[]     PROGMEM = "<dt>Station Subnet</dt><dd>{1}</dd>";