diff --git a/app/Http/Middleware/CheckForSetup.php b/app/Http/Middleware/CheckForSetup.php
index 4203a4c8da..4865d05f41 100644
--- a/app/Http/Middleware/CheckForSetup.php
+++ b/app/Http/Middleware/CheckForSetup.php
@@ -14,6 +14,11 @@ class CheckForSetup
     public function handle($request, Closure $next, $guard = null)
     {
 
+        // This is dumb
+        if ($request->is('_debugbar*')) {
+            return $next($request);
+        }
+
         if (Setting::setupCompleted()) {
 
             if ($request->is('setup*')) {
diff --git a/resources/views/layouts/setup.blade.php b/resources/views/layouts/setup.blade.php
index 9f53b17e24..1c9178931a 100644
--- a/resources/views/layouts/setup.blade.php
+++ b/resources/views/layouts/setup.blade.php
@@ -127,11 +127,14 @@
               </div>
           </div>
           <script src="{{ asset(elixir('assets/js/all.js')) }}"></script>
+
         <script>
             $(function () {
                 $(".select2").select2();
             });
         </script>
+          @section('moar_scripts')
+          @show
 
     </body>
 </html>
diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php
index 1c745df840..2d08301b6e 100644
--- a/resources/views/setup/index.blade.php
+++ b/resources/views/setup/index.blade.php
@@ -170,6 +170,7 @@ Create a User ::
           </td>
           <td id="mailtestresult">
              <button class="btn btn-default" id="mailtest"> Test Email</button>
+              <span id="mailtestresult"></span>
           </td>
         </tr>
 
@@ -187,36 +188,39 @@ Create a User ::
 
 
 
+@section('moar_scripts')
+    <script type="text/javascript">
+        $(document).ready(function () {
+
+        $("#mailtest").click(function(){
+
+              $("#mailtestresult").html('<i class="fa fa-spinner fa-spin"></i> Sending Email');
+
+              $.ajax({url: "{{ route('setup.mailtest') }}", success: function(result){
+                  if (result=='success') {
+                    $("#mailrow").addClass('success');
+                    $("#mailtesticon").html('<i class="fa fa-check preflight-success"></i>');
+                    $("#mailtestresult").html('No errors on this end! Check your <code>{{ config('mail.from.address') }}</code> email account for a test email.');
+                  } else {
+                    $("#mailrow").addClass('danger');
+                    $("#mailtesticon").html('<i class="fa fa-check preflight-error"></i>');
+                    $("#mailtestresult").html('Something went wrong. Your email was not sent. Check your mail settings in your <code>.env</code> file.');
+
+                  }
 
 
-<script>
-$("#mailtest").click(function(){
-  $("#mailtestresult").html('<i class="fa fa-spinner fa-spin"></i> Sending Email');
-
-  $.ajax({url: "{{ route('setup.mailtest') }}", success: function(result){
-      if (result=='success') {
-        $("#mailrow").addClass('success');
-        $("#mailtesticon").html('<i class="fa fa-check preflight-success"></i>');
-        $("#mailtestresult").html('No errors on this end! Check your <code>{{ config('mail.from.address') }}</code> email account for a test email.');
-      } else {
-        $("#mailrow").addClass('danger');
-        $("#mailtesticon").html('<i class="fa fa-check preflight-error"></i>');
-        $("#mailtestresult").html('Something went wrong. Your email was not sent. Check your mail settings in your <code>.env</code> file.');
-
-      }
+              },
+              error: function (result) {
+                $("#mailrow").addClass('danger');
+                $("#mailtesticon").html('<i class="fa fa-check preflight-error"></i>');
+                $("#mailtestresult").html('Something went wrong. The server returned an error. Check your mail settings in your <code>.env</code> file, and check your <code>storage/logs</code> for additional information..');
+              }
 
 
-  },
-  error: function (result) {
-    $("#mailrow").addClass('danger');
-    $("#mailtesticon").html('<i class="fa fa-check preflight-error"></i>');
-    $("#mailtestresult").html('Something went wrong. The server returned an error. Check your mail settings in your <code>.env</code> file, and check your <code>storage/logs</code> for additional information..');
-  }
+            });
 
-
-});
-
-
-});
-</script>
+        });
+     });
+    </script>
+@stop
 @stop