diff --git a/js/custom.js b/js/custom.js
index 958658b2..b938556d 100644
--- a/js/custom.js
+++ b/js/custom.js
@@ -193,6 +193,26 @@ function loadWifiStations(refresh) {
 
 $(".js-reload-wifi-stations").on("click", loadWifiStations(true));
 
+$(document).on("click", ".js-toggle-password", function(e) {
+    var button = $(e.target)
+    var field  = $(button.data("target"));
+    if (field.is(":input")) {
+        e.preventDefault();
+
+        if (!button.data("__toggle-with-initial")) {
+            button.data("__toggle-with-initial", button.text())
+        }
+
+        if (field.attr("type") === "password") {
+            button.text(button.data("toggle-with"));
+            field.attr("type", "text");
+        } else {
+            button.text(button.data("__toggle-with-initial"));
+            field.attr("type", "password");
+        }
+    }
+});
+
 $(document)
     .ajaxSend(setCSRFTokenHeader)
     .ready(contentLoaded)
diff --git a/templates/configure_client.php b/templates/configure_client.php
index 5a3a5831..053dc452 100644
--- a/templates/configure_client.php
+++ b/templates/configure_client.php
@@ -21,14 +21,3 @@
     </div><!-- /.panel-primary -->
   </div><!-- /.col-lg-12 -->
 </div><!-- /.row -->
-
-<script>
-  function showPassword(index) {
-      var x = document.getElementsByName("passphrase"+index)[0];
-      if (x.type === "password") {
-          x.type = "text";
-      } else {
-          x.type = "password";
-      }
-  }
-</script>
diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php
index a002b85d..1c2b7542 100644
--- a/templates/wifi_stations.php
+++ b/templates/wifi_stations.php
@@ -69,7 +69,7 @@
             <?php } else { ?>
               <input type="password" class="form-control" aria-describedby="passphrase" name="passphrase<?php echo $index ?>" value="<?php echo $network['passphrase'] ?>" onKeyUp="CheckPSK(this, 'update<?php echo $index?>')" >
               <span class="input-group-btn">
-                <button class="btn btn-default" onclick="showPassword(<?php echo $index; ?>)" type="button">Show</button>
+                <button class="btn btn-default js-toggle-password" type="button" data-target="[name=passphrase<?php echo $index ?>]" data-toggle-with="<?php echo _("Hide") ?>">Show</button>
               </span>
             <?php } ?>
         </div>