diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index f3ab0c6f9..ad80c42f9 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -14,7 +14,7 @@ class AdminController extends Controller
 {
     public function __construct() {
         $this->middleware('auth');
-        $this->middleware('role:Admin');
+        $this->middleware('permission:role.admin');
     }
 
     public function displayDashboard() {
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index cecd3356d..cdae4231e 100644
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -21,7 +21,7 @@ class DashboardController extends Controller
     public function __construct()
     {
         $this->middleware('auth');
-        $this->middleware('role:Guest');
+        $this->middleware('permission:role.guest');
     }
 
     /**
diff --git a/app/Http/Controllers/EsiScopeController.php b/app/Http/Controllers/EsiScopeController.php
index 25bbec30f..45070490e 100644
--- a/app/Http/Controllers/EsiScopeController.php
+++ b/app/Http/Controllers/EsiScopeController.php
@@ -14,7 +14,7 @@ class EsiScopeController extends Controller
 {
     public function __construct() {
         $this->middleware('auth');
-        $this->middleware('role:User');
+        $this->middleware('permission:role.user');
     }
 
     public function displayScopes() {
diff --git a/app/Http/Controllers/FinancesController.php b/app/Http/Controllers/FinancesController.php
index 6b0744e1d..3cfac1f66 100644
--- a/app/Http/Controllers/FinancesController.php
+++ b/app/Http/Controllers/FinancesController.php
@@ -8,7 +8,7 @@ class FinancesController extends Controller
 {
     public function __construct() {
         $this->middleware('auth');
-        $this->middleware('role:Admin');
+        $this->middleware('permission:role.admin');
     }
 
     public function displayFinances() {
diff --git a/app/Http/Controllers/FleetsController.php b/app/Http/Controllers/FleetsController.php
index d545ca2a6..1b9acbb39 100644
--- a/app/Http/Controllers/FleetsController.php
+++ b/app/Http/Controllers/FleetsController.php
@@ -24,7 +24,7 @@ class FleetsController extends Controller
      */
     public function __construct() {
         $this->middleware('auth');
-        $this->middleware('role:User');
+        $this->middleware('permission:role.user');
     }
     
     /**
diff --git a/app/Http/Controllers/MoonsAdminController.php b/app/Http/Controllers/MoonsAdminController.php
index af86cede8..366aa0627 100644
--- a/app/Http/Controllers/MoonsAdminController.php
+++ b/app/Http/Controllers/MoonsAdminController.php
@@ -18,7 +18,7 @@ class MoonsAdminController extends Controller
 {
     public function __construct() {
         $this->middleware('auth');
-        $this->middleware('role:Admin');
+        $this->middleware('permission:role.admin');
     }
 
     public function showJournalEntries() {
diff --git a/app/Http/Controllers/MoonsController.php b/app/Http/Controllers/MoonsController.php
index e4c365636..a30fbc5b3 100644
--- a/app/Http/Controllers/MoonsController.php
+++ b/app/Http/Controllers/MoonsController.php
@@ -14,7 +14,7 @@ class MoonsController extends Controller
 {
     public function __construct() {
         $this->middleware('auth');
-        $this->middleware('role:User');
+        $this->middleware('permission:role.user');
     }
 
     /**
diff --git a/app/Http/Controllers/WikiController.php b/app/Http/Controllers/WikiController.php
index aab8113a5..6dc2368c9 100644
--- a/app/Http/Controllers/WikiController.php
+++ b/app/Http/Controllers/WikiController.php
@@ -15,7 +15,7 @@ class WikiController extends Controller
 {
     public function __construct() {
         $this->middleware('auth');
-        $this->middleware('role:User');
+        $this->middleware('permission:role.user');
     }
     
     public function displayRegister() {
diff --git a/app/Http/Middleware/RequirePermission.php b/app/Http/Middleware/RequirePermission.php
index 3cb553782..d8452e6cb 100644
--- a/app/Http/Middleware/RequirePermission.php
+++ b/app/Http/Middleware/RequirePermission.php
@@ -19,7 +19,7 @@ class RequirePermission
     public function handle($request, Closure $next, $permission)
     {
         $confirmed = false;
-        /*
+        
         if(strpos($permission, 'role.')) {
             $confirmed = $this->CheckRole($permission);
         } else {
@@ -29,12 +29,6 @@ class RequirePermission
         if($confirmed === false) {
             abort(403, "You don't have permission to access this area.");
         }
-        */
-
-        $check = UserPermission::where(['character_id' => auth()->user()->character_id, 'permission' => $permission])->get(['permission']);
-        if(!isset($check[0]->permission)) {
-            abort(403, "You don't have permission to access this area.");
-        }
 
         return $next($request);
     }
diff --git a/app/Http/Middleware/RequireRole.php b/app/Http/Middleware/RequireRole.php
deleted file mode 100644
index 1485eea78..000000000
--- a/app/Http/Middleware/RequireRole.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use DB;
-
-use App\Models\User\UserPermission;
-
-class RequireRole
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next, $role)
-    {
-        $confirmed = false;
-        $ranking = [
-            'role.none' => 0,
-            'role.guest' => 1,
-            'role.user' => 2,
-            'role.director' => 3,
-            'role.admin' => 4,
-        ];
-        //Using eloquent let's get the roles for the character
-        $check = UserPermission::where(['character_id' => auth()->user()->character_id, 'permission' => $role])->get(['permission']);
-        
-        if(!isset($check[0]->role)) {
-            abort(403, "You don't have permissions to access this area!");    
-        }
-
-        if($ranking[$check[0]->role] === $ranking[$role]) {
-            $confirmed = true;
-        }
-        if($ranking[$check[0]->role] >= $ranking[$role]) {
-            $confirmed = true;
-        }
-
-        abort_unless(auth()->check() && $confirmed, 403, "You don't have permissions to access this area!");
-
-        return $next($request);
-    }
-}