diff --git a/scripts/pi-hole/lua/header.lp b/scripts/pi-hole/lua/header.lp
index e59d2a1d..8b5d1b23 100644
--- a/scripts/pi-hole/lua/header.lp
+++ b/scripts/pi-hole/lua/header.lp
@@ -10,6 +10,7 @@
 <?
 starttime = mg.time(true)
 hostname = pihole.hostname()
+webhome = pihole.webhome()
 -- Get name of script by matching whatever is after the last "/" in the URI
 scriptname = mg.request_info.request_uri:match(pihole.webhome().."(.*)$")
 -- Fall back to "index.lp" if no match is found (e.g. when accessing the root)
diff --git a/scripts/pi-hole/lua/header_authenticated.lp b/scripts/pi-hole/lua/header_authenticated.lp
index 35ac7c6d..d062fd7a 100644
--- a/scripts/pi-hole/lua/header_authenticated.lp
+++ b/scripts/pi-hole/lua/header_authenticated.lp
@@ -94,7 +94,9 @@ mg.include('header.lp','r')
                                 <a class="btn-link" href="https://discourse.pi-hole.net/" rel="noopener" target="_blank"><i class="fa-fw menu-icon fab fa-discourse"></i> Pi-hole Forum</a>
                                 <a class="btn-link" href="https://github.com/pi-hole" rel="noopener" target="_blank"><i class="fa-fw menu-icon fab fa-github"></i> GitHub</a>
                                 <a class="btn-link" href="https://discourse.pi-hole.net/c/announcements/5" rel="noopener" target="_blank"><i class="fa-fw menu-icon fa-solid fa-rocket"></i> Pi-hole Releases</a>
+                                <? if pihole.needLogin(mg.request_info.remote_addr) then ?>
                                 <a class="btn-link" href="#" onclick="utils.doLogout();"><i class="fa-fw menu-icon fa-solid fa-arrow-right-from-bracket"></i> Log out</a>
+                                <? end ?>
                             </li>
                         </ul>
                     </li>
diff --git a/scripts/pi-hole/lua/sidebar.lp b/scripts/pi-hole/lua/sidebar.lp
index 5f37f9cd..78394e75 100644
--- a/scripts/pi-hole/lua/sidebar.lp
+++ b/scripts/pi-hole/lua/sidebar.lp
@@ -13,7 +13,7 @@
             <!-- Sidebar user panel -->
             <div class="user-panel">
                 <div class="pull-left image">
-                    <img class="logo-img" src="<?=pihole.webhome()?>img/logo.svg" alt="Pi-hole logo">
+                    <img class="logo-img" src="<?=webhome?>img/logo.svg" alt="Pi-hole logo">
                 </div>
                 <div class="pull-left info">
                     <p>Status</p>
@@ -28,13 +28,13 @@
                 <li class="header text-uppercase">Main</li>
                 <!-- Home Page -->
                 <li class="menu-main<? if scriptname == 'index' or scriptname == 'index.lp' then ?> active<? end ?>">
-                    <a href="<?=pihole.webhome()?>">
+                    <a href="<?=webhome?>">
                         <i class="fa fa-fw menu-icon fa-home"></i> <span>Dashboard</span>
                     </a>
                 </li>
                 <!-- Query Log -->
                 <li class="menu-analysis<? if scriptname == 'queries' then ?> active<? end ?>">
-                    <a href="<?=pihole.webhome()?>queries">
+                    <a href="<?=webhome?>queries">
                         <i class="fa fa-fw menu-icon fa-file-alt"></i> <span>Query Log</span>
                     </a>
                 </li>
@@ -42,7 +42,7 @@
                 <li class="header text-uppercase">Group Management</li>
                 <!-- Group Management -->
                 <li class="menu-group<? if scriptname == 'groups' then ?> active<? end ?>">
-                    <a href="<?=pihole.webhome()?>groups">
+                    <a href="<?=webhome?>groups">
                         <i class="fa fa-fw menu-icon fa-user-friends"></i> <span>Groups
                         <span class="pull-right-container">
                             <span class="label label-primary pull-right" id="num_groups" title="Number of defined groups"></span>
@@ -50,7 +50,7 @@
                     </a>
                 </li>
                 <li class="menu-group<? if scriptname == 'groups/clients' then ?> active<? end ?>">
-                    <a href="<?=pihole.webhome()?>groups/clients">
+                    <a href="<?=webhome?>groups/clients">
                         <i class="fa fa-fw menu-icon fa-laptop"></i> <span>Clients
                         <span class="pull-right-container">
                             <span class="label label-primary pull-right" id="num_clients" title="Number of defined clients"></span>
@@ -58,7 +58,7 @@
                     </a>
                 </li>
                 <li class="menu-group<? if scriptname == 'groups/domains' then ?> active<? end ?>">
-                    <a href="<?=pihole.webhome()?>groups/domains">
+                    <a href="<?=webhome?>groups/domains">
                         <i class="fa fa-fw menu-icon fa-list"></i> <span>Domains
                         <span class="pull-right-container">
                             <span class="label bg-red pull-right" id="num_denied" title="Number of deny rules (domains and regex)"></span>
@@ -67,7 +67,7 @@
                     </a>
                 </li>
                 <li class="menu-group<? if scriptname == 'groups/adlists' then ?> active<? end ?>">
-                    <a href="<?=pihole.webhome()?>groups/adlists">
+                    <a href="<?=webhome?>groups/adlists">
                         <i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Adlists
                         <span class="pull-right-container">
                             <span class="label bg-blue pull-right" id="num_lists" title="Number of defined adlists"></span>
@@ -80,7 +80,7 @@
                 <!-- Local DNS Records -->
                 <!-- Enable/Disable Blocking -->
                 <li id="pihole-disable" class="menu-dns treeview">
-                    <a href="<?=pihole.webhome()?>#">
+                    <a href="<?=webhome?>#">
                         <i class="fa fa-fw menu-icon fa-stop"></i> <span>Disable Blocking&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span></span>
                         <span class="pull-right-container">
                             <i class="fa fa-angle-left pull-right"></i>
@@ -88,35 +88,35 @@
                     </a>
                     <ul class="treeview-menu">
                         <li>
-                            <a href="<?=pihole.webhome()?>#" id="pihole-disable-indefinitely">
+                            <a href="<?=webhome?>#" id="pihole-disable-indefinitely">
                                 <i class="fa fa-fw menu-icon fa-infinity"></i> Indefinitely
                             </a>
                         </li>
                         <li>
-                            <a href="<?=pihole.webhome()?>#" id="pihole-disable-10s">
+                            <a href="<?=webhome?>#" id="pihole-disable-10s">
                                 <i class="fa fa-fw menu-icon fa-clock"></i> For 10 seconds
                             </a>
                         </li>
                         <li>
-                            <a href="<?=pihole.webhome()?>#" id="pihole-disable-30s">
+                            <a href="<?=webhome?>#" id="pihole-disable-30s">
                                 <i class="fa fa-fw menu-icon fa-clock"></i> For 30 seconds
                             </a>
                         </li>
                         <li>
-                            <a href="<?=pihole.webhome()?>#" id="pihole-disable-5m">
+                            <a href="<?=webhome?>#" id="pihole-disable-5m">
                                 <i class="fa fa-fw menu-icon fas fa-clock"></i> For 5 minutes
                             </a>
                         </li>
                         <li>
-                            <a href="<?=pihole.webhome()?>#" id="pihole-disable-cst" data-toggle="modal" data-target="#customDisableModal">
+                            <a href="<?=webhome?>#" id="pihole-disable-cst" data-toggle="modal" data-target="#customDisableModal">
                                 <i class="fa fa-fw menu-icon fa-user-clock"></i> Custom time
                             </a>
                         </li>
                     </ul>
-                    <!-- <a href="<?=pihole.webhome()?>#" id="flip-status"><i class="fa fa-stop"></i> <span>Disable</span></a> -->
+                    <!-- <a href="<?=webhome?>#" id="flip-status"><i class="fa fa-stop"></i> <span>Disable</span></a> -->
                 </li>
                 <li id="pihole-enable" class="menu-dns treeview" style="display: none;">
-                    <a href="<?=pihole.webhome()?>#">
+                    <a href="<?=webhome?>#">
                         <i class="fa fa-fw menu-icon fa-play"></i>
                         <span id="enableLabel">Enable Blocking&nbsp;&nbsp;&nbsp;
                             <span id="flip-status-enable"></span>
@@ -126,7 +126,7 @@
                 <li class="header text-uppercase">System</li>
                 <!-- Settings -->
                 <li class="menu-system treeview <? if startsWith(scriptname, 'settings/') then ?> active<? end ?>">
-                    <a href="<?=pihole.webhome()?>#">
+                    <a href="<?=webhome?>#">
                         <i class="fa fa-fw menu-icon fa-cogs"></i> <span>Settings</span>
                         <span class="pull-right-container">
                             <i class="fa fa-angle-left pull-right"></i>
@@ -134,42 +134,42 @@
                     </a>
                     <ul class="treeview-menu">
                         <li class="<? if scriptname == 'settings/system' then ?> active<? end ?>">
-                            <a href="<?=pihole.webhome()?>settings/system">
+                            <a href="<?=webhome?>settings/system">
                                 <i class="fa-fw menu-icon fa-solid fa-circle-info"></i> <span>System</span>
                             </a>
                         </li>
                         <li class="<? if scriptname == 'settings/dns' then ?> active<? end ?>">
-                            <a href="<?=pihole.webhome()?>settings/dns">
+                            <a href="<?=webhome?>settings/dns">
                                 <i class="fa-fw menu-icon fa-solid fa-book-atlas"></i> <span>DNS</span>
                             </a>
                         </li>
                         <li class="<? if scriptname == 'settings/dhcp' then ?> active<? end ?>">
-                            <a href="<?=pihole.webhome()?>settings/dhcp">
+                            <a href="<?=webhome?>settings/dhcp">
                                 <i class="fa-fw menu-icon fa-solid fa-sitemap"></i> <span>DHCP</span>
                             </a>
                         </li>
                         <li class="<? if scriptname == 'settings/api' then ?> active<? end ?>">
-                            <a href="<?=pihole.webhome()?>settings/api">
+                            <a href="<?=webhome?>settings/api">
                                 <i class="fa-fw menu-icon fa-solid fa-window-restore"></i> <span>Web interface / API</span>
                             </a>
                         </li>
                         <li class="<? if scriptname == 'settings/privacy' then ?> active<? end ?>">
-                            <a href="<?=pihole.webhome()?>settings/privacy">
+                            <a href="<?=webhome?>settings/privacy">
                                 <i class="fa-fw menu-icon fa-solid fa-binoculars"></i> <span>Privacy</span>
                             </a>
                         </li>
                         <li class="<? if scriptname == 'settings/teleporter' then ?> active<? end ?>">
-                            <a href="<?=pihole.webhome()?>settings/teleporter">
+                            <a href="<?=webhome?>settings/teleporter">
                                 <i class="fa-fw menu-icon fa-solid fa-file-export"></i> <span>Teleporter</span>
                             </a>
                         </li>
                         <li class="<? if scriptname == 'settings/dnsrecords' then ?> active<? end ?> settings-level-1">
-                            <a href="<?=pihole.webhome()?>settings/dnsrecords">
+                            <a href="<?=webhome?>settings/dnsrecords">
                                 <i class="fa-fw menu-icon fa-solid fa-address-book"></i> <span>Local DNS Records</span>
                             </a>
                         </li>
                         <li class="<? if scriptname == 'settings/advanced' then ?> active<? end ?> settings-level-2">
-                            <a href="<?=pihole.webhome()?>settings/advanced">
+                            <a href="<?=webhome?>settings/advanced">
                                 <i class="fa-fw menu-icon fa-solid fa-pen-to-square"></i> <span>All settings</span>
                             </a>
                         </li>
@@ -177,7 +177,7 @@
                 </li>
                 <!-- Tools -->
                 <li class="menu-system treeview<? if in_array(scriptname, {'messages', 'gravity', 'search', 'taillog', 'network'}) then ?> active<? end ?>">
-                    <a href="<?=pihole.webhome()?>#">
+                    <a href="<?=webhome?>#">
                         <i class="fa fa-fw menu-icon fa-tools"></i> <span>Tools</span>
                         <span class="warning-count hidden"></span>
                         <span class="pull-right-container">
@@ -187,14 +187,14 @@
                     <ul class="treeview-menu">
                         <!-- Pi-hole diagnosis -->
                         <li class="<? if scriptname == 'messages' then ?> active<? end ?>">
-                            <a href="<?=pihole.webhome()?>messages">
+                            <a href="<?=webhome?>messages">
                                 <i class="fa fa-fw menu-icon fa-file-medical-alt"></i> <span>Pi-hole diagnosis</span>
                                 <span class="pull-right-container warning-count hidden"></span>
                             </a>
                         </li>
                         <!-- Tail log files -->
                         <li class="treeview <? if scriptname == 'taillog' then ?> active<? end ?>">
-                            <a href="<?=pihole.webhome()?>#">
+                            <a href="<?=webhome?>#">
                                 <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> <span>Tail log files</span>
                                 <span class="pull-right-container">
                                     <i class="fa fa-angle-left pull-right"></i>
@@ -203,19 +203,19 @@
                             <ul class="treeview-menu">
                                 <!-- Tail pihole.log -->
                                 <li class="<? if scriptname == 'taillog' and GET("file") == "dnsmasq" then ?> active<? end ?>">
-                                    <a href="<?=pihole.webhome()?>taillog?file=dnsmasq">
+                                    <a href="<?=webhome?>taillog?file=dnsmasq">
                                         <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> pihole.log
                                     </a>
                                 </li>
                                 <!-- Tail FTL.log -->
                                 <li class="<? if scriptname == 'taillog' and GET("file") == "ftl" then ?> active<? end ?>">
-                                    <a href="<?=pihole.webhome()?>taillog?file=ftl">
+                                    <a href="<?=webhome?>taillog?file=ftl">
                                         <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> FTL.log
                                     </a>
                                 </li>
                                 <!-- Tail webserver.log -->
                                 <li class="<? if scriptname == 'taillog' and GET("file") == "webserver" then ?> active<? end ?>">
-                                    <a href="<?=pihole.webhome()?>taillog?file=webserver">
+                                    <a href="<?=webhome?>taillog?file=webserver">
                                         <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> webserver.log
                                     </a>
                                 </li>
@@ -223,19 +223,19 @@
                         </li>
                         <!-- Run gravity.sh -->
                         <li class="<? if scriptname == 'gravity' then ?> active<? end ?>">
-                            <a href="<?=pihole.webhome()?>gravity">
+                            <a href="<?=webhome?>gravity">
                                 <i class="fa fa-fw menu-icon fa-arrow-circle-down"></i> <span>Update Gravity</span>
                             </a>
                         </li>
                         <!-- Query Lists -->
                         <li class="<? if scriptname == 'search' then ?> active<? end ?>">
-                            <a href="<?=pihole.webhome()?>search">
+                            <a href="<?=webhome?>search">
                                 <i class="fa fa-fw menu-icon fa-search"></i> <span>Search Adlists</span>
                             </a>
                         </li>
                         <!-- Network -->
                         <li class="<? if scriptname == 'network' then ?> active<? end ?>">
-                            <a href="<?=pihole.webhome()?>network">
+                            <a href="<?=webhome?>network">
                                 <i class="fa fa-fw menu-icon fa-network-wired"></i> <span>Network</span>
                             </a>
                         </li>
@@ -245,7 +245,7 @@
                 <!-- Donate button -->
                 <li class="header text-uppercase">Donate</li>
                 <li class="menu-donate">
-                    <a href="<?=pihole.webhome()?>https://pi-hole.net/donate/" target="_blank">
+                    <a href="<?=webhome?>https://pi-hole.net/donate/" target="_blank">
                         <i class="fas fa-fw menu-icon fa-donate"></i> <span>Donate</span>
                     </a>
                 </li>