diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js
index 7d7f9c18..e2cb82b4 100644
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -891,3 +891,23 @@ function loadBlurHash(elem, src) {
             });
     }
 }
+
+function _toggleRevealToken(elem, click) {
+    var input = elem.parent().next('input');
+    if ((input.prop('type') === 'password' && click) || !input.val()) {
+        input.prop('type', 'text');
+        elem.children('.fa').removeClass('fa-eye-slash').addClass('fa-eye');
+    } else {
+        input.prop('type', 'password');
+        elem.children('.fa').removeClass('fa-eye').addClass('fa-eye-slash');
+    }
+}
+function toggleRevealTokens() {
+    $('.reveal-token').each(function () {
+        _toggleRevealToken($(this));
+    });
+}
+
+$('body').on('click', '.reveal-token', function() {
+    _toggleRevealToken($(this), true);
+});
diff --git a/data/interfaces/default/mobile_device_config.html b/data/interfaces/default/mobile_device_config.html
index 8985813e..32deb09d 100644
--- a/data/interfaces/default/mobile_device_config.html
+++ b/data/interfaces/default/mobile_device_config.html
@@ -87,6 +87,7 @@
         }
 
         getMobileDevicesTable();
+        toggleRevealTokens();
     }
 
     function deleteCallback() {
@@ -122,6 +123,8 @@
             $('#'+configToggle).val(0);
         }
     });
+
+    toggleRevealTokens();
 </script>
 % else:
 <div class="modal-dialog" role="document">
diff --git a/data/interfaces/default/newsletter_config.html b/data/interfaces/default/newsletter_config.html
index 6d3313b4..88e2590f 100644
--- a/data/interfaces/default/newsletter_config.html
+++ b/data/interfaces/default/newsletter_config.html
@@ -676,6 +676,7 @@
         }
 
         getNewslettersTable();
+        toggleRevealTokens();
     }
 
     function deleteCallback() {
@@ -787,6 +788,8 @@
         };
         $(this).on('focus keyup input', function () { resizeTextarea(this); }).removeAttr('data-autoresize');
     });
+
+    toggleRevealTokens();
 </script>
 % else:
 <div class="modal-dialog" role="document">
diff --git a/data/interfaces/default/notifier_config.html b/data/interfaces/default/notifier_config.html
index 521c48b9..03dde272 100644
--- a/data/interfaces/default/notifier_config.html
+++ b/data/interfaces/default/notifier_config.html
@@ -453,6 +453,7 @@
         }
 
         getNotifiersTable();
+        toggleRevealTokens();
     }
 
     function deleteCallback() {
@@ -911,6 +912,8 @@
         };
         $(this).on('focus keyup input', function () { resizeTextarea(this); }).removeAttr('data-autoresize');
     });
+
+    toggleRevealTokens();
 </script>
 % else:
 <div class="modal-dialog" role="document">
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 08be9f7c..9d2c5a88 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -2267,6 +2267,7 @@ $(document).ready(function() {
         getMobileDevicesTable();
         loadUpdateDistros();
         setBaseURLSuffix();
+        toggleRevealTokens();
         settingsChanged = false;
     }
 
@@ -3204,16 +3205,7 @@ $(document).ready(function() {
         openBrowsePath(null, path, filter, description, target);
     });
 
-    $('body').on('click', '.reveal-token', function() {
-        var input = $(this).parent().next('input');
-        if (input.prop('type') === 'password') {
-            input.prop('type', 'text');
-            $(this).children('.fa').removeClass('fa-eye-slash').addClass('fa-eye');
-        } else {
-            input.prop('type', 'password');
-            $(this).children('.fa').removeClass('fa-eye').addClass('fa-eye-slash');
-        }
-    });
+    toggleRevealTokens();
 });
 </script>
 </%def>