diff --git a/app/Http/Controllers/Dashboard/AdminController.php b/app/Http/Controllers/Dashboard/AdminController.php
index 7288c12e5..30bcfb7db 100644
--- a/app/Http/Controllers/Dashboard/AdminController.php
+++ b/app/Http/Controllers/Dashboard/AdminController.php
@@ -32,17 +32,8 @@ class AdminController extends Controller
         $usersArr = User::orderBy('name', 'asc')->paginate(50);
 
         foreach($usersArr as $user) {
-            $role = UserRole::where([
-                'character_id' => $user->character_id,
-            ])->get();
-
-            $perms = UserPermission::where([
-                'character_id' => $user->character_id,
-            ])->get('permission')->toArray();
-
-            //Setup the extra stuff needed
-            $user->role = $role;
-            $user->permissions = $perms;
+            $user->role = $user->getRole();
+            $user->permissions = $user->getPermissionsArray();
         }
 
         return view('admin.dashboards.userspaged')->with('usersArr', $usersArr);
diff --git a/resources/views/admin/dashboards/userspaged.blade.php b/resources/views/admin/dashboards/userspaged.blade.php
index 41aa58485..be34ca285 100644
--- a/resources/views/admin/dashboards/userspaged.blade.php
+++ b/resources/views/admin/dashboards/userspaged.blade.php
@@ -17,11 +17,10 @@
                     @foreach($usersArr as $user)
                     <tr>
                         <td>{{ $user->name }}</td>
-                        <td>{{ $user->getRole() }}</td>
+                        <td>{{ $user->role }}</td>
                         <td>
-                        {!! $perms = $user->getPermissionsArray() !!}                            
-                        @if($perms != null)
-                            @foreach($perms as $perm)
+                        @if($user->permission)
+                            @foreach($user->permissions as $perm)
                                 {{ implode(', ', $perm) }}
                             @endforeach
                         @else