diff --git a/includes/header.php b/includes/header.php
index 2e06189..8cda967 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -81,8 +81,9 @@ $settings = $this->page->settings;
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand"
-               href="<?php echo $settings->name_link; ?>"><?php echo $settings->name; ?></a>
+            <a class="navbar-brand" href="<?php echo $settings->name_link; ?>">
+                <?php echo $settings->name; ?>
+            </a>
         </div>
         <nav id="litebans-navbar" class="collapse navbar-collapse">
             <?php
diff --git a/includes/page.php b/includes/page.php
index 624e369..b2aad40 100644
--- a/includes/page.php
+++ b/includes/page.php
@@ -44,8 +44,11 @@ class Page {
             'kick' => null,
         );
 
-        $h = new Header($this);
-        $h->print_header();
+        if ($header) {
+            $h = new Header($this);
+            $this->header = $h;
+            $h->print_header();
+        }
     }
 
     public function type_info($type) {