diff --git a/src/meshwifi/meshhttp.cpp b/src/meshwifi/meshhttp.cpp
index 6243d8420..0c8540344 100644
--- a/src/meshwifi/meshhttp.cpp
+++ b/src/meshwifi/meshhttp.cpp
@@ -927,7 +927,11 @@ void handleScanNetworks(HTTPRequest *req, HTTPResponse *res)
 
         for (int i = 0; i < n; ++i) {
             char ssidArray[50];
-            String(WiFi.SSID(i)).toCharArray(ssidArray, WiFi.SSID(i).length());
+            String ssidString = String(WiFi.SSID(i));
+            //String ssidString = String(WiFi.SSID(i)).toCharArray(ssidArray, WiFi.SSID(i).length());
+            ssidString.replace("\"", "\\\"");
+            ssidString.toCharArray(ssidArray, 50);
+                
             
             if (WiFi.encryptionType(i) != WIFI_AUTH_OPEN) {
                 //res->println("{\"ssid\": \"%s\",\"rssi\": -75}, ", String(WiFi.SSID(i).c_str() );
@@ -939,7 +943,7 @@ void handleScanNetworks(HTTPRequest *req, HTTPResponse *res)
                 }
             }
             // Yield some cpu cycles to IP stack.
-            //   This is important in case the list is large and it takes us tome to return
+            //   This is important in case the list is large and it takes us time to return
             //   to the main loop.
             yield();
         }
diff --git a/src/meshwifi/meshwifi.cpp b/src/meshwifi/meshwifi.cpp
index 0f28c1fad..3d747b711 100644
--- a/src/meshwifi/meshwifi.cpp
+++ b/src/meshwifi/meshwifi.cpp
@@ -40,8 +40,8 @@ bool isWifiAvailable()
 
     // strcpy(radioConfig.preferences.wifi_ssid, "");
     // strcpy(radioConfig.preferences.wifi_password, "");
-    strcpy(radioConfig.preferences.wifi_ssid, "meshtastic");
-    strcpy(radioConfig.preferences.wifi_password, "meshtastic!");
+    // strcpy(radioConfig.preferences.wifi_ssid, "meshtastic");
+    // strcpy(radioConfig.preferences.wifi_password, "meshtastic!");
 
     if (*wifiName && *wifiPsw) {
         return 1;