diff --git a/includes/top_nav.php b/includes/top_nav.php
index bcf8e672..c392ecdf 100644
--- a/includes/top_nav.php
+++ b/includes/top_nav.php
@@ -115,8 +115,4 @@
 
     </ul>
 </nav>
-
-<?php if ($config_module_enable_ticketing == 1) {
-    include_once __DIR__ . "/../modals/top_nav_tickets_modal.php";
-    } ?>
 <!-- /.navbar -->
diff --git a/index.php b/index.php
index 883a4c77..086f1321 100644
--- a/index.php
+++ b/index.php
@@ -9,6 +9,7 @@ if (file_exists("config.php")) {
         header("Location: /user");
     }
 } else {
-	header("Location: /setup");
+	header("Location: setup");
+    exit();
 }
 
diff --git a/user/index.php b/user/index.php
index 4b475c56..371304ea 100644
--- a/user/index.php
+++ b/user/index.php
@@ -1,30 +1,24 @@
 <?php 
 
-if (file_exists("../config.php")) {
-    require_once "includes/inc_all.php";
- ?>
-	<!-- Breadcrumbs-->
-	<ol class="breadcrumb">
-	  <li class="breadcrumb-item">
-	    <a href="index.php">Dashboard</a>
-	  </li>
-	  <li class="breadcrumb-item active">Blank Page</li>
-	</ol>
+require_once "includes/inc_all.php";
 
-	<!-- Page Content -->
-	<h1>Blank Page</h1>
-	<hr>
-	<?php
+?>
+	
+<!-- Breadcrumbs-->
+<ol class="breadcrumb">
+  <li class="breadcrumb-item">
+    <a href="index.php">Dashboard</a>
+  </li>
+  <li class="breadcrumb-item active">Blank Page</li>
+</ol>
 
-    if (isset($config_start_page)) { ?>
-        <meta http-equiv="refresh" content="0;url=<?php echo $config_start_page; ?>">
-    <?php }
+<!-- Page Content -->
+<h1>Blank Page</h1>
+<hr>
+<?php
 
-	require_once "../../includes/footer.php";
+if (isset($config_start_page)) { ?>
+    <meta http-equiv="refresh" content="0;url=<?php echo $config_start_page; ?>">
+<?php }
 
-
-} else {
-	header("Location: ../setup/index.php");
-}
-
-?>
\ No newline at end of file
+require_once "../includes/footer.php";
\ No newline at end of file