diff --git a/README.md b/README.md
index 9e0f564..c000cc1 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,9 @@ Full documentation is available on https://Hieromon.github.io/AutoConnect, some
 
 ## Change log
 
+### [0.9.4] April 22, 2018.
+- Automatically focus passphrase after selecting SSID with Configure New AP.
+
 ### [0.9.3] March 23, 2018.
 - Supports a static IP address assignment.
 
diff --git a/docs/changelog/index.html b/docs/changelog/index.html
index ee582f8..c6e9ec1 100644
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -101,7 +101,7 @@
     <input class="md-toggle" data-md-toggle="search" type="checkbox" id="search">
     <label class="md-overlay" data-md-component="overlay" for="drawer"></label>
     
-      <a href="#093-march-23-2018" tabindex="1" class="md-skip">
+      <a href="#094-april-22-2018" tabindex="1" class="md-skip">
         Skip to content
       </a>
     
@@ -401,25 +401,38 @@
     <ul class="md-nav__list" data-md-scrollfix>
       
         <li class="md-nav__item">
+  <a href="#094-april-22-2018" title="[0.9.4] April 22, 2018." class="md-nav__link">
+    [0.9.4] April 22, 2018.
+  </a>
+  
+    <nav class="md-nav">
+      <ul class="md-nav__list">
+        
+          <li class="md-nav__item">
   <a href="#093-march-23-2018" title="[0.9.3] March 23, 2018." class="md-nav__link">
     [0.9.3] March 23, 2018.
   </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>
       
       
       
@@ -463,25 +476,38 @@
     <ul class="md-nav__list" data-md-scrollfix>
       
         <li class="md-nav__item">
+  <a href="#094-april-22-2018" title="[0.9.4] April 22, 2018." class="md-nav__link">
+    [0.9.4] April 22, 2018.
+  </a>
+  
+    <nav class="md-nav">
+      <ul class="md-nav__list">
+        
+          <li class="md-nav__item">
   <a href="#093-march-23-2018" title="[0.9.3] March 23, 2018." class="md-nav__link">
     [0.9.3] March 23, 2018.
   </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>
       
       
       
@@ -502,7 +528,11 @@
                 
                   <h1>Change log</h1>
                 
-                <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>
+                <h3 id="094-april-22-2018">[0.9.4] April 22, 2018.<a class="headerlink" href="#094-april-22-2018" title="Permanent link">&para;</a></h3>
+<ul>
+<li>Automatically focus passphrase after selecting SSID with Configure New AP.</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>
 <ul>
 <li>Supports a static IP address assignment.</li>
 </ul>
diff --git a/docs/search/search_index.json b/docs/search/search_index.json
index ea2faa8..8e3b0bd 100644
--- a/docs/search/search_index.json
+++ b/docs/search/search_index.json
@@ -637,9 +637,14 @@
         },
         {
             "location": "/changelog/index.html",
-            "text": "[0.9.3] March 23, 2018.\n\u00b6\n\n\n\n\nSupports a static IP address assignment.\n\n\n\n\n[0.9.2] March 19, 2018.\n\u00b6\n\n\n\n\nImprovement of string literal declaration with the examples, no library change.\n\n\n\n\n[0.9.1] March 13, 2018.\n\u00b6\n\n\n\n\nA release of the stable.",
+            "text": "[0.9.4] April 22, 2018.\n\u00b6\n\n\n\n\nAutomatically focus passphrase after selecting SSID with Configure New AP.\n\n\n\n\n[0.9.3] March 23, 2018.\n\u00b6\n\n\n\n\nSupports a static IP address assignment.\n\n\n\n\n[0.9.2] March 19, 2018.\n\u00b6\n\n\n\n\nImprovement of string literal declaration with the examples, no library change.\n\n\n\n\n[0.9.1] March 13, 2018.\n\u00b6\n\n\n\n\nA release of the stable.",
             "title": "Change log"
         },
+        {
+            "location": "/changelog/index.html#094-april-22-2018",
+            "text": "Automatically focus passphrase after selecting SSID with Configure New AP.",
+            "title": "[0.9.4] April 22, 2018."
+        },
         {
             "location": "/changelog/index.html#093-march-23-2018",
             "text": "Supports a static IP address assignment.",
diff --git a/docs/sitemap.xml b/docs/sitemap.xml
index c69c05a..b55efc0 100644
--- a/docs/sitemap.xml
+++ b/docs/sitemap.xml
@@ -4,7 +4,7 @@
     
     <url>
      <loc>https://Hieromon.github.io/AutoConnect//index.html</loc>
-     <lastmod>2018-03-26</lastmod>
+     <lastmod>2018-04-23</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -12,7 +12,7 @@
     
     <url>
      <loc>https://Hieromon.github.io/AutoConnect//gettingstarted/index.html</loc>
-     <lastmod>2018-03-26</lastmod>
+     <lastmod>2018-04-23</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -20,7 +20,7 @@
     
     <url>
      <loc>https://Hieromon.github.io/AutoConnect//menu/index.html</loc>
-     <lastmod>2018-03-26</lastmod>
+     <lastmod>2018-04-23</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -28,7 +28,7 @@
     
     <url>
      <loc>https://Hieromon.github.io/AutoConnect//basicusage/index.html</loc>
-     <lastmod>2018-03-26</lastmod>
+     <lastmod>2018-04-23</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -36,7 +36,7 @@
     
     <url>
      <loc>https://Hieromon.github.io/AutoConnect//advancedusage/index.html</loc>
-     <lastmod>2018-03-26</lastmod>
+     <lastmod>2018-04-23</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -44,7 +44,7 @@
     
     <url>
      <loc>https://Hieromon.github.io/AutoConnect//api/index.html</loc>
-     <lastmod>2018-03-26</lastmod>
+     <lastmod>2018-04-23</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -52,7 +52,7 @@
     
     <url>
      <loc>https://Hieromon.github.io/AutoConnect//examples/index.html</loc>
-     <lastmod>2018-03-26</lastmod>
+     <lastmod>2018-04-23</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -60,7 +60,7 @@
     
     <url>
      <loc>https://Hieromon.github.io/AutoConnect//faq/index.html</loc>
-     <lastmod>2018-03-26</lastmod>
+     <lastmod>2018-04-23</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -68,7 +68,7 @@
     
     <url>
      <loc>https://Hieromon.github.io/AutoConnect//changelog/index.html</loc>
-     <lastmod>2018-03-26</lastmod>
+     <lastmod>2018-04-23</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -76,7 +76,7 @@
     
     <url>
      <loc>https://Hieromon.github.io/AutoConnect//license/index.html</loc>
-     <lastmod>2018-03-26</lastmod>
+     <lastmod>2018-04-23</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
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 d1a5a43..c984a3f 100644
--- a/mkdocs/changelog.md
+++ b/mkdocs/changelog.md
@@ -1,3 +1,6 @@
+### [0.9.4] April 22, 2018.
+- Automatically focus passphrase after selecting SSID with Configure New AP.
+
 #### [0.9.3] March 23, 2018.
 
 - Supports a static IP address assignment.
diff --git a/src/AutoConnectPage.cpp b/src/AutoConnectPage.cpp
index b97aa2f..e747985 100644
--- a/src/AutoConnectPage.cpp
+++ b/src/AutoConnectPage.cpp
@@ -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>"));