diff --git a/app/Http/Controllers/Admin/ApiController.php b/app/Http/Controllers/Admin/ApiController.php
index 5069f0e0..a83d6106 100644
--- a/app/Http/Controllers/Admin/ApiController.php
+++ b/app/Http/Controllers/Admin/ApiController.php
@@ -2,14 +2,14 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Admin;
 
+use CachetHQ\Cachet\Http\Controllers\AbstractController;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\IncidentTemplate;
 use Exception;
 use GrahamCampbell\Binput\Facades\Binput;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Routing\Controller;
 
-class ApiController extends Controller
+class ApiController extends AbstractController
 {
     /**
      * Updates a component with the entered info.
diff --git a/app/Http/Controllers/Admin/ComponentController.php b/app/Http/Controllers/Admin/ComponentController.php
index 1a2b8026..ba84af66 100644
--- a/app/Http/Controllers/Admin/ComponentController.php
+++ b/app/Http/Controllers/Admin/ComponentController.php
@@ -2,16 +2,16 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Admin;
 
+use CachetHQ\Cachet\Http\Controllers\AbstractController;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Tag;
 use GrahamCampbell\Binput\Facades\Binput;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
 
-class ComponentController extends Controller
+class ComponentController extends AbstractController
 {
     protected $subMenu = [];
 
diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php
index 1943dd08..4f1aa6c7 100644
--- a/app/Http/Controllers/Admin/DashboardController.php
+++ b/app/Http/Controllers/Admin/DashboardController.php
@@ -2,11 +2,11 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Admin;
 
+use CachetHQ\Cachet\Http\Controllers\AbstractController;
 use CachetHQ\Cachet\Models\Component;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\View;
 
-class DashboardController extends Controller
+class DashboardController extends AbstractController
 {
     /**
      * Shows the dashboard view.
diff --git a/app/Http/Controllers/Admin/IncidentController.php b/app/Http/Controllers/Admin/IncidentController.php
index b5613a91..f2a10b31 100644
--- a/app/Http/Controllers/Admin/IncidentController.php
+++ b/app/Http/Controllers/Admin/IncidentController.php
@@ -2,16 +2,16 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Admin;
 
+use CachetHQ\Cachet\Http\Controllers\AbstractController;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentTemplate;
 use GrahamCampbell\Binput\Facades\Binput;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
 
-class IncidentController extends Controller
+class IncidentController extends AbstractController
 {
     /**
      * Stores the sub-sidebar tree list.
diff --git a/app/Http/Controllers/Admin/MetricController.php b/app/Http/Controllers/Admin/MetricController.php
index 3c36ec36..ff917107 100644
--- a/app/Http/Controllers/Admin/MetricController.php
+++ b/app/Http/Controllers/Admin/MetricController.php
@@ -2,14 +2,14 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Admin;
 
+use CachetHQ\Cachet\Http\Controllers\AbstractController;
 use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Cachet\Models\MetricPoint;
 use GrahamCampbell\Binput\Facades\Binput;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
 
-class MetricController extends Controller
+class MetricController extends AbstractController
 {
     /**
      * Shows the metrics view.
diff --git a/app/Http/Controllers/Admin/ScheduleController.php b/app/Http/Controllers/Admin/ScheduleController.php
index 6955908d..1f81b60f 100644
--- a/app/Http/Controllers/Admin/ScheduleController.php
+++ b/app/Http/Controllers/Admin/ScheduleController.php
@@ -3,10 +3,10 @@
 namespace CachetHQ\Cachet\Http\Controllers\Admin;
 
 use CachetHQ\Cachet\Facades\Setting;
+use CachetHQ\Cachet\Http\Controllers\AbstractController;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentTemplate;
 use GrahamCampbell\Binput\Facades\Binput;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Redirect;
@@ -14,7 +14,7 @@ use Illuminate\Support\Facades\View;
 use Illuminate\Support\MessageBag;
 use Jenssegers\Date\Date;
 
-class ScheduleController extends Controller
+class ScheduleController extends AbstractController
 {
     /**
      * Stores the sub-sidebar tree list.
diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php
index 191d0f30..63f95a62 100644
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -2,16 +2,16 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Admin;
 
+use CachetHQ\Cachet\Http\Controllers\AbstractController;
 use CachetHQ\Cachet\Models\Setting;
 use CachetHQ\Cachet\Models\User;
 use Exception;
 use GrahamCampbell\Binput\Facades\Binput;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
 
-class SettingsController extends Controller
+class SettingsController extends AbstractController
 {
     protected $subMenu = [];
     protected $subTitle = 'Settings';
diff --git a/app/Http/Controllers/Admin/TeamController.php b/app/Http/Controllers/Admin/TeamController.php
index 97ddf2fa..2f8b245b 100644
--- a/app/Http/Controllers/Admin/TeamController.php
+++ b/app/Http/Controllers/Admin/TeamController.php
@@ -2,13 +2,13 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Admin;
 
+use CachetHQ\Cachet\Http\Controllers\AbstractController;
 use CachetHQ\Cachet\Models\User;
 use GrahamCampbell\Binput\Facades\Binput;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
 
-class TeamController extends Controller
+class TeamController extends AbstractController
 {
     /**
      * Shows the team members view.
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index cc8245a3..d3d46550 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -2,15 +2,15 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Admin;
 
+use CachetHQ\Cachet\Http\Controllers\AbstractController;
 use CachetHQ\Cachet\Models\User;
 use GrahamCampbell\Binput\Facades\Binput;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
 use PragmaRX\Google2FA\Vendor\Laravel\Facade as Google2FA;
 
-class UserController extends Controller
+class UserController extends AbstractController
 {
     /**
      * Shows the user view.
diff --git a/app/Http/Controllers/AtomController.php b/app/Http/Controllers/AtomController.php
index d024faca..4b96666e 100644
--- a/app/Http/Controllers/AtomController.php
+++ b/app/Http/Controllers/AtomController.php
@@ -4,11 +4,10 @@ namespace CachetHQ\Cachet\Http\Controllers;
 
 use CachetHQ\Cachet\Facades\Setting;
 use CachetHQ\Cachet\Models\Incident;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Response;
 use Roumen\Feed\Facades\Feed;
 
-class AtomController extends Controller
+class AtomController extends AbstractController
 {
     /**
      * Generates an Atom feed of all incidents.
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
deleted file mode 100644
index 3078679b..00000000
--- a/app/Http/Controllers/Auth/AuthController.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php namespace CachetHQ\Cachet\Http\Controllers\Auth;
-
-use CachetHQ\Cachet\Http\Controllers\Controller;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Contracts\Auth\Registrar;
-use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
-
-class AuthController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Registration & Login Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles the registration of new users, as well as the
-    | authentication of existing users. By default, this controller uses
-    | a simple trait to add these behaviors. Why don't you explore it?
-    |
-    */
-
-    use AuthenticatesAndRegistersUsers;
-
-    /**
-     * Create a new authentication controller instance.
-     *
-     * @param \Illuminate\Contracts\Auth\Guard     $auth
-     * @param \Illuminate\Contracts\Auth\Registrar $registrar
-     *
-     * @return void
-     */
-    public function __construct(Guard $auth, Registrar $registrar)
-    {
-        $this->auth = $auth;
-        $this->registrar = $registrar;
-
-        $this->middleware('guest', ['except' => 'getLogout']);
-    }
-}
diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
deleted file mode 100644
index 89a86774..00000000
--- a/app/Http/Controllers/Auth/PasswordController.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php namespace CachetHQ\Cachet\Http\Controllers\Auth;
-
-use CachetHQ\Cachet\Http\Controllers\Controller;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Contracts\Auth\PasswordBroker;
-use Illuminate\Foundation\Auth\ResetsPasswords;
-
-class PasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset requests
-    | and uses a simple trait to include this behavior. You're free to
-    | explore this trait and override any methods you wish to tweak.
-    |
-    */
-
-    use ResetsPasswords;
-
-    /**
-     * Create a new password controller instance.
-     *
-     * @param \Illuminate\Contracts\Auth\Guard          $auth
-     * @param \Illuminate\Contracts\Auth\PasswordBroker $passwords
-     *
-     * @return void
-     */
-    public function __construct(Guard $auth, PasswordBroker $passwords)
-    {
-        $this->auth = $auth;
-        $this->passwords = $passwords;
-
-        $this->middleware('guest');
-    }
-}
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index f8d27f82..17b57a5d 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -4,7 +4,6 @@ namespace CachetHQ\Cachet\Http\Controllers;
 
 use GrahamCampbell\Binput\Facades\Binput;
 use GrahamCampbell\Throttle\Facades\Throttle;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Request;
@@ -15,7 +14,7 @@ use PragmaRX\Google2FA\Vendor\Laravel\Facade as Google2FA;
 /**
  * Logs users into their account.
  */
-class AuthController extends Controller
+class AuthController extends AbstractController
 {
     /**
      * Shows the login view.
diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php
index 7901660c..3b452809 100644
--- a/app/Http/Controllers/RssController.php
+++ b/app/Http/Controllers/RssController.php
@@ -4,11 +4,10 @@ namespace CachetHQ\Cachet\Http\Controllers;
 
 use CachetHQ\Cachet\Facades\Setting;
 use CachetHQ\Cachet\Models\Incident;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Response;
 use Roumen\Feed\Facades\Feed;
 
-class RssController extends Controller
+class RssController extends AbstractController
 {
     /**
      * Generates an RSS feed of all incidents.