diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js
index 2854d551..7639de6e 100644
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -893,7 +893,7 @@ function loadBlurHash(elem, src) {
 }
 
 function _toggleRevealToken(elem, click) {
-    var input = elem.parent().next('input');
+    var input = elem.parent().siblings('input');
     if ((input.prop('type') === 'password' && click) || !input.val()) {
         input.prop('type', 'text');
         elem.children('.fa').removeClass('fa-eye-slash').addClass('fa-eye');
diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html
index cd463f3b..3712c668 100644
--- a/data/interfaces/default/welcome.html
+++ b/data/interfaces/default/welcome.html
@@ -80,7 +80,12 @@
                         <label for="http_password">HTTP Password</label>
                         <div class="row">
                             <div class="col-xs-8">
-                                <input type="password" class="form-control auth-settings" id="http_password" name="http_password" value="" size="30" autocomplete="new-password">
+                                <div class="input-group">
+                                    <input type="password" class="form-control auth-settings" id="http_password" name="http_password" value="" size="30" autocomplete="new-password">
+                                    <span class="input-group-btn">
+                                        <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
+                                    </span>
+                                </div>
                             </div>
                         </div>
                     </div>