diff --git a/README.md b/README.md
index 3618e23..6ad35f7 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,8 @@ Connect to the Access Point with the SSID "Exploit" with a password of "DotAgenc
 Open a web browser pointed to "http://192.168.1.1"  
 The default administration username is "admin" and password "hacktheplanet".  
   
+NOTE: Certain devices seem to have trouble connecting to a password protected ESP8266 access point. The symptoms of this involve repeatedly being prompted to enter the password and being unable to connect to the ESP8266 via WiFi. This can be solved by following the above instructions but instead issuing the command "ResetDefaultConfig:OpenNetwork" via serial. The device will be restored to the factory defaults(with the exception of now being an unsecured network). The device will reboot and you may now connect to it as an unsecured WiFi access point with an SSID of "Exploit". You should now be able to establish a connection.  
+  
 -----  
 Configure ESPloit  
 -----  
diff --git a/source/Arduino_32u4_Code/Arduino_32u4_Code.ino b/source/Arduino_32u4_Code/Arduino_32u4_Code.ino
index cf3a9e8..9a8f8f6 100644
--- a/source/Arduino_32u4_Code/Arduino_32u4_Code.ino
+++ b/source/Arduino_32u4_Code/Arduino_32u4_Code.ino
@@ -40,7 +40,7 @@
 //Prints debug lines via serial if set to 1
 //const int debug=0;
 
-String version = "2.1";
+String version = "2.2";
 
 //Used later for determining if we are ready to release a key press or a combination of key presses
 int keypressdone=0;
@@ -65,11 +65,9 @@ void setup() {
 void loop() {  
 //  while (SOFTserial.available()) {
   while (Serial.available()) {
-    String cmd1 = Serial.readStringUntil(':');
-        if(cmd1 == "ResetDefaultConfig"){
-          Serial1.println("ResetDefaultConfig:");
-          Serial.println("Resetting configuration files back to default settings.");
-        }
+    String serial_link = Serial.readStringUntil('\n');
+          Serial1.println(serial_link);
+          Serial.println("Relaying command to connected ESP device.");
   }
   while (Serial1.available()) {
 //    String cmd = SOFTserial.readStringUntil(':');
diff --git a/source/ESP_Code/ESP_Code.ino b/source/ESP_Code/ESP_Code.ino
index 33acd15..ccbee14 100644
--- a/source/ESP_Code/ESP_Code.ino
+++ b/source/ESP_Code/ESP_Code.ino
@@ -100,6 +100,7 @@ int DelayLength;
 int livepayloaddelay;
 int autopwn;
 char autopayload[64];
+int open_network=0;
 
 void runpayload() {
     File f = SPIFFS.open(autopayload, "r");
@@ -361,7 +362,12 @@ bool loadDefaults() {
   json["version"] = version;
   json["accesspointmode"] = "1";
   json["ssid"] = "Exploit";
-  json["password"] = "DotAgency";
+  if(open_network==0){
+    json["password"] = "DotAgency";
+  }
+  else if(open_network==1){
+    json["password"] = "";
+  }
   json["channel"] = "6";
   json["hidden"] = "0";
   json["local_IP"] = "192.168.1.1";
@@ -1103,6 +1109,13 @@ void loop() {
   while (Serial.available()) {
     String cmd = Serial.readStringUntil(':');
         if(cmd == "ResetDefaultConfig"){
+          String RSDC = Serial.readStringUntil('\n');
+          if(RSDC.indexOf("OpenNetwork") >=0) {
+            open_network=1;
+          }
+          else {
+            open_network=0;
+          }
           loadDefaults();
           ESP.restart();
         }
diff --git a/source/ESP_Code/ESP_Code.ino.generic.bin b/source/ESP_Code/ESP_Code.ino.generic.bin
index fbf56e7..d769499 100644
Binary files a/source/ESP_Code/ESP_Code.ino.generic.bin and b/source/ESP_Code/ESP_Code.ino.generic.bin differ
diff --git a/source/ESP_Code/HelpText.h b/source/ESP_Code/HelpText.h
index 255ac65..7507b18 100644
--- a/source/ESP_Code/HelpText.h
+++ b/source/ESP_Code/HelpText.h
@@ -100,6 +100,8 @@ Connect to the Access Point with the SSID "Exploit" with a password of "DotAgenc
 Open a web browser pointed to "http://192.168.1.1"<br>
 The default administration username is "admin" and password "hacktheplanet".<br>
 <br>
+NOTE: Certain devices seem to have trouble connecting to a password protected ESP8266 access point. The symptoms of this involve repeatedly being prompted to enter the password and being unable to connect to the ESP8266 via WiFi. This can be solved by following the above instructions but instead issuing the command "ResetDefaultConfig:OpenNetwork" via serial. The device will be restored to the factory defaults(with the exception of now being an unsecured network). The device will reboot and you may now connect to it as an unsecured WiFi access point with an SSID of "Exploit". You should now be able to establish a connection.<br>
+<br>
 -----<br>
 Configure ESPloit<br>
 -----<br>
diff --git a/source/ESP_Code/version.h b/source/ESP_Code/version.h
index 39b8296..8e7855f 100644
--- a/source/ESP_Code/version.h
+++ b/source/ESP_Code/version.h
@@ -1,2 +1,2 @@
-String version = "2.5.0";
-String latestardversion = "2.1";
+String version = "2.5.1";
+String latestardversion = "2.2";