diff --git a/src/web/html/setup.html b/src/web/html/setup.html
index 9452f0e3..9466a573 100644
--- a/src/web/html/setup.html
+++ b/src/web/html/setup.html
@@ -71,7 +71,10 @@
                             </div>
                             <div class="row mb-2 mb-sm-3">
                                 <div class="col-12 col-sm-3 my-2">{#PASSWORD}</div>
-                                <div class="col-12 col-sm-9"><input type="password" name="pwd" value="{PWD}"/></div>
+                                <div class="col-12 col-sm-9"><input type="password" name="pwd" id="password" value="{PWD}"/>
+                                    <input type="checkbox" onclick="togglepassword()" />Show Password
+                                </div>
+
                             </div>
                             <!--ENDIF_ETHERNET-->
                         </fieldset>
@@ -637,6 +640,17 @@
                 });
             });
 
+            function togglepassword()
+            {
+                var x = document.getElementById("password");
+                if (x.type === "password") {
+                    x.type = "text";
+                } else {
+                    x.type = "password";
+                }
+
+            }
+
             function hide() {
                 document.getElementById("form").submit();
                 var e = document.getElementById("content");
diff --git a/src/web/lang.json b/src/web/lang.json
index 6f1b7c03..6697049e 100644
--- a/src/web/lang.json
+++ b/src/web/lang.json
@@ -253,6 +253,11 @@
                     "en": "AP Password (min. length: 8)",
                     "de": "AP Passwort (min. L&auml;nge: 8 Zeichen)"
                 },
+                {
+                    "token": "SHOW_PWD",
+                    "en": "show password",
+                    "de": "Passwort anzeigen"
+                },
                 {
                     "token": "SEARCH_NETWORKS",
                     "en": "Search Networks",