diff --git a/README.md b/README.md
index 1de6c69..1571e06 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,7 @@ Full documentation is available on https://Hieromon.github.io/AutoConnect, some
 ## Change log
 
 ### [0.9.4] May 5, 2018.
+- Automatically focus passphrase after selecting SSID with Configure New AP.
 - Supports AutoConnectConfig::autoReconnect option, it will scan the WLAN when it can not connect to the default SSID, apply the applicable credentials if it is saved, and try reconnecting.
 
 ### [0.9.3] March 23, 2018.
diff --git a/docs/changelog/index.html b/docs/changelog/index.html
index a29afdc..dc36518 100644
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -413,20 +413,25 @@
   </a>
   
 </li>
-      
-        <li class="md-nav__item">
+        
+          <li class="md-nav__item">
   <a href="#092-march-19-2018" title="[0.9.2] March 19, 2018." class="md-nav__link">
     [0.9.2] March 19, 2018.
   </a>
   
 </li>
-      
-        <li class="md-nav__item">
+        
+          <li class="md-nav__item">
   <a href="#091-march-13-2018" title="[0.9.1] March 13, 2018." class="md-nav__link">
     [0.9.1] March 13, 2018.
   </a>
   
 </li>
+        
+      </ul>
+    </nav>
+  
+</li>
       
       
       
@@ -482,20 +487,25 @@
   </a>
   
 </li>
-      
-        <li class="md-nav__item">
+        
+          <li class="md-nav__item">
   <a href="#092-march-19-2018" title="[0.9.2] March 19, 2018." class="md-nav__link">
     [0.9.2] March 19, 2018.
   </a>
   
 </li>
-      
-        <li class="md-nav__item">
+        
+          <li class="md-nav__item">
   <a href="#091-march-13-2018" title="[0.9.1] March 13, 2018." class="md-nav__link">
     [0.9.1] March 13, 2018.
   </a>
   
 </li>
+        
+      </ul>
+    </nav>
+  
+</li>
       
       
       
@@ -518,6 +528,7 @@
                 
                 <h4 id="094-may-5-2018">[0.9.4] May 5, 2018.<a class="headerlink" href="#094-may-5-2018" title="Permanent link">&para;</a></h4>
 <ul>
+<li>Automatically focus passphrase after selecting SSID with Configure New AP.</li>
 <li>Supports AutoConnectConfig::autoReconnect option, it will scan the WLAN when it can not connect to the default SSID, apply the applicable credentials if it is saved, and try reconnecting.</li>
 </ul>
 <h4 id="093-march-23-2018">[0.9.3] March 23, 2018.<a class="headerlink" href="#093-march-23-2018" title="Permanent link">&para;</a></h4>
diff --git a/docs/search/search_index.json b/docs/search/search_index.json
index 07de4ac..fa8a45d 100644
--- a/docs/search/search_index.json
+++ b/docs/search/search_index.json
@@ -655,6 +655,11 @@
             "text": "Supports AutoConnectConfig::autoReconnect option, it will scan the WLAN when it can not connect to the default SSID, apply the applicable credentials if it is saved, and try reconnecting.",
             "title": "[0.9.4] May 5, 2018."
         },
+        {
+            "location": "/changelog/index.html#094-april-22-2018",
+            "text": "Automatically focus passphrase after selecting SSID with Configure New AP.",
+            "title": "[0.9.4] May 5, 2018."
+        },
         {
             "location": "/changelog/index.html#093-march-23-2018",
             "text": "Supports a static IP address assignment.",
diff --git a/library.json b/library.json
index b4c2d6e..517a7b9 100644
--- a/library.json
+++ b/library.json
@@ -17,6 +17,6 @@
   ],
   "frameworks": "arduino",
   "platforms": "espressif8266",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "license": "MIT"
 }
diff --git a/library.properties b/library.properties
index 3c0d1e3..5bc5689 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=AutoConnect
-version=0.9.2
+version=0.9.4
 author=Hieromon Ikasamo <hieromon@gmail.com>
 maintainer=Hieromon Ikasamo <hieromon@gmail.com>
 sentence=ESP8266 WLAN configuration at runtime with web interface.
diff --git a/mkdocs/changelog.md b/mkdocs/changelog.md
index 148f018..bde1c6d 100644
--- a/mkdocs/changelog.md
+++ b/mkdocs/changelog.md
@@ -1,5 +1,6 @@
 #### [0.9.4] May 5, 2018.
 
+- Automatically focus passphrase after selecting SSID with Configure New AP.
 - Supports AutoConnectConfig::autoReconnect option, it will scan the WLAN when it can not connect to the default SSID, apply the applicable credentials if it is saved, and try reconnecting.
 
 #### [0.9.3] March 23, 2018.
diff --git a/src/AutoConnectPage.cpp b/src/AutoConnectPage.cpp
index b97aa2f..88832e9 100644
--- a/src/AutoConnectPage.cpp
+++ b/src/AutoConnectPage.cpp
@@ -2,8 +2,8 @@
  *  AutoConnect portal site web page implementation.
  *  @file   AutoConnectPage.h
  *  @author hieromon@gmail.com
- *  @version    0.9.1
- *  @date   2018-02-13
+ *  @version    0.9.4
+ *  @date   2018-04-22
  *  @copyright  MIT license.
  */
 
@@ -882,7 +882,7 @@ String AutoConnect::_token_LIST_SSID(PageArgument& args) {
   for (uint8_t i = 0; i < nn; i++) {
     String ssid = WiFi.SSID(i);
     if (ssid.length() > 0) {
-      ssidList += String(F("<input type=\"button\" onClick=\"document.getElementById('ssid').value=this.getAttribute('value')\" value=\"")) + ssid + String(F("\">"));
+      ssidList += String(F("<input type=\"button\" onClick=\"document.getElementById('ssid').value=this.getAttribute('value');document.getElementById('passphrase').focus()\" value=\"")) + ssid + String(F("\">"));
       ssidList += String(F("<label>")) + String(AutoConnect::_toWiFiQuality(WiFi.RSSI(i))) + String(F("%</label>"));
       if (WiFi.encryptionType(i) != ENC_TYPE_NONE)
         ssidList += String(F("<span class=\"img-lock\"></span>"));