diff --git a/libraries/DNSServer/examples/CaptivePortal/CaptivePortal.ino b/libraries/DNSServer/examples/CaptivePortal/CaptivePortal.ino
index 53b159502b..b59cda2d92 100644
--- a/libraries/DNSServer/examples/CaptivePortal/CaptivePortal.ino
+++ b/libraries/DNSServer/examples/CaptivePortal/CaptivePortal.ino
@@ -8,9 +8,11 @@ DNSServer dnsServer;
 ESP8266WebServer webServer(80);
 
 String responseHTML = ""
-                      "<!DOCTYPE html><html><head><title>CaptivePortal</title></head><body>"
-                      "<h1>Hello World!</h1><p>This is a captive portal example. All requests will "
-                      "be redirected here.</p></body></html>";
+                      "<!DOCTYPE html><html lang='en'><head>"
+                      "<meta name='viewport' content='width=device-width'>"
+                      "<title>CaptivePortal</title></head><body>"
+                      "<h1>Hello World!</h1><p>This is a captive portal example."
+                      " All requests will be redirected here.</p></body></html>";
 
 void setup() {
   WiFi.mode(WIFI_AP);
diff --git a/libraries/DNSServer/examples/CaptivePortalAdvanced/CaptivePortalAdvanced.ino b/libraries/DNSServer/examples/CaptivePortalAdvanced/CaptivePortalAdvanced.ino
index 0f2553fbc2..e97dfbc0a4 100644
--- a/libraries/DNSServer/examples/CaptivePortalAdvanced/CaptivePortalAdvanced.ino
+++ b/libraries/DNSServer/examples/CaptivePortalAdvanced/CaptivePortalAdvanced.ino
@@ -30,8 +30,8 @@ const char *softAP_password = APPSK;
 const char *myHostname = "esp8266";
 
 /* Don't set this wifi credentials. They are configurated at runtime and stored on EEPROM */
-char ssid[32] = "";
-char password[32] = "";
+char ssid[33] = "";
+char password[65] = "";
 
 // DNS server
 const byte DNS_PORT = 53;
@@ -140,4 +140,3 @@ void loop() {
   //HTTP
   server.handleClient();
 }
-
diff --git a/libraries/DNSServer/examples/CaptivePortalAdvanced/handleHttp.ino b/libraries/DNSServer/examples/CaptivePortalAdvanced/handleHttp.ino
index 1baac437d1..dc286c1840 100644
--- a/libraries/DNSServer/examples/CaptivePortalAdvanced/handleHttp.ino
+++ b/libraries/DNSServer/examples/CaptivePortalAdvanced/handleHttp.ino
@@ -9,7 +9,9 @@ void handleRoot() {
 
   String Page;
   Page += F(
-            "<html><head></head><body>"
+            "<!DOCTYPE html><html lang='en'><head>"
+            "<meta name='viewport' content='width=device-width'>"
+            "<title>CaptivePortal</title></head><body>"
             "<h1>HELLO WORLD!!</h1>");
   if (server.client().localIP() == apIP) {
     Page += String(F("<p>You are connected through the soft AP: ")) + softAP_ssid + F("</p>");
@@ -43,7 +45,9 @@ void handleWifi() {
 
   String Page;
   Page += F(
-            "<html><head></head><body>"
+            "<!DOCTYPE html><html lang='en'><head>"
+            "<meta name='viewport' content='width=device-width'>"
+            "<title>CaptivePortal</title></head><body>"
             "<h1>Wifi config</h1>");
   if (server.client().localIP() == apIP) {
     Page += String(F("<p>You are connected through the soft AP: ")) + softAP_ssid + F("</p>");
@@ -130,4 +134,3 @@ void handleNotFound() {
   server.sendHeader("Expires", "-1");
   server.send(404, "text/plain", message);
 }
-
