diff --git a/Changelog b/Changelog
index b392c1c1c..3574b26d8 100755
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+2018-04-20 DariusIII
+	* Chg: Update error pages
 2018-04-19 DariusIII
 	* Chg: Update actions in admin theme
 	* Fix: Fix group list pagination
diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php
index 0770f47a7..8239dfd8c 100644
--- a/app/Http/Controllers/BasePageController.php
+++ b/app/Http/Controllers/BasePageController.php
@@ -184,7 +184,7 @@ class BasePageController extends Controller
      */
     public function show503(): void
     {
-        abort(503);
+        return view('errors.503')->with('Error', 'Service temporarily unavailable');
     }
 
     /**
@@ -198,18 +198,17 @@ class BasePageController extends Controller
     /**
      * Show maintenance page.
      */
-    public function showMaintenance(): void
+    public function showMaintenance()
     {
-        header('HTTP/1.1 503 Service Temporarily Unavailable');
-        die(view('errors.maintenance'));
+        return view('errors.maintenance')->with('Message', 'Service Temporarily Unavailable');
     }
 
     /**
      * Show Security token mismatch page.
      */
-    public function showTokenError(): void
+    public function showTokenError()
     {
-        abort(419);
+        return view('errors.tokenError')->with('Error', 'Token mismatch');
     }
 
     /**
@@ -217,7 +216,7 @@ class BasePageController extends Controller
      */
     public function show429($retry = ''): void
     {
-        abort(429);
+        abort(429, $retry);
     }
 
     public function render()