diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js
index b352ccd3..a85fbd1d 100644
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
@@ -105,7 +105,7 @@ function check_messages() {
 
       $("#pihole-diagnosis").prop("title", title);
       $("#pihole-diagnosis-count").text(data.message_count);
-      $("#pihole-diagnosis").removeClass("hidden");
+      $("#pihole-diagnosis").removeClass("d-none");
     }
   });
 }
diff --git a/scripts/pi-hole/js/messages.js b/scripts/pi-hole/js/messages.js
index 889bc03a..2816a9c3 100644
--- a/scripts/pi-hole/js/messages.js
+++ b/scripts/pi-hole/js/messages.js
@@ -7,7 +7,7 @@
 
 /* global utils:false */
 
-var token = $("#token").html();
+var token = $("#token").text();
 
 function render_timestamp(data, type) {
   // Display and search content
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 3f27a43a..937053ae 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -271,7 +271,7 @@ if($auth) {
             </a>
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
-                    <li  id="pihole-diagnosis" class="hidden">
+                    <li id="pihole-diagnosis" class="d-none">
                         <a href="messages.php">
                             <i class="fa fa-exclamation-triangle"></i>
                             <span class="label label-warning" id="pihole-diagnosis-count"></span>
diff --git a/style/pi-hole.css b/style/pi-hole.css
index b1b49964..216a0938 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -278,4 +278,4 @@
 
 .hidden {
     display: none !important;
-}
+}
\ No newline at end of file