diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 1db7200b6..93e6e082e 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -671,18 +671,17 @@ function pidofFTL()
         <!-- Main content -->
         <section class="content">
 <?php
-    // If password is not equal to the password set
-    // in the setupVars.conf file, then we skip any
-    // content and just complete the page. If no
-    // password is set at all, we keep the current
-    // behavior: everything is always authorized
-    // and will be displayed
-    //
-    // If auth is required and not set, i.e. no successfully logged in,
-    // we show the reduced version of the summary (index) page
-    if(!$auth && (!isset($indexpage) || isset($_GET['login']))){
-        require "scripts/pi-hole/php/loginpage.php";
-        require "footer.php";
-        exit();
-    }
+// If password is not equal to the password set
+// in the setupVars.conf file, then we skip any
+// content and just complete the page. If no
+// password is set at all, we keep the current
+// behavior: everything is always authorized
+// and will be displayed
+//
+// If auth is required and not set, i.e. no successfully logged in,
+// we show the reduced version of the summary (index) page
+if (!$auth && (!isset($indexpage) || isset($_GET['login']))) {
+    require "scripts/pi-hole/php/loginpage.php";
+    exit();
+}
 ?>
diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 6a2339c0d..06843e4db 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -4,7 +4,8 @@
 *  Network-wide ad blocking via your own hardware.
 *
 *  This file is copyright under the latest version of the EUPL.
-*  Please see LICENSE file for your rights under this license. */ ?>
+*  Please see LICENSE file for your rights under this license. */
+?>
 
 <div class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2" style="float:none">
   <div class="panel panel-default">
@@ -69,3 +70,6 @@
     </div>
   </div>
 </div>
+<?php
+require "scripts/pi-hole/php/footer.php";
+?>