diff --git a/app/Controller/PermissionsController.php b/app/Controller/PermissionsController.php
index de53bcb1..015d4f06 100755
--- a/app/Controller/PermissionsController.php
+++ b/app/Controller/PermissionsController.php
@@ -13,16 +13,36 @@ function admin_index()
         $this->layout = 'admin';
 
         $this->loadModel('Rank');
-        $custom_ranks = $this->Rank->find('all');
-        $this->set(compact('custom_ranks'));
+        $all_ranks = [
+            [
+                "Rank" => [
+                    'rank_id' => 0,
+                    'name' => $this->Lang->get('GLOBAL__TYPE_NORMAL'),
+                ],
+            ],
+            [
+                "Rank" => [
+                    'rank_id' => 2,
+                    'name' => $this->Lang->get('USER__RANK_MODERATOR'),
+                ],
+            ],
+        ];
+
+        $all_ranks = array_merge($all_ranks, $this->Rank->find('all'));
+        $this->set(compact('all_ranks'));
 
 
         if ($this->request->is('post')) {
             $permissions = [];
+
+            foreach ($all_ranks as $rank) {
+                $rank = $rank['Rank'];
+                $permissions[$rank['rank_id']] = [];
+            }
+
             foreach ($this->request->data as $permission => $checked) {
-                if(is_array($checked))
+                if (is_array($checked))
                     continue;
-                
                 list($permission, $rank) = explode('-', $permission);
                 $permissions[$rank][] = $permission;
             }
diff --git a/app/View/Permissions/admin_index.ctp b/app/View/Permissions/admin_index.ctp
index 452bc893..1d0da453 100755
--- a/app/View/Permissions/admin_index.ctp
+++ b/app/View/Permissions/admin_index.ctp
@@ -15,20 +15,19 @@
                     <form action="" method="post">
                         <input name="data[_Token][key]" value="<?= $csrfToken ?>" type="hidden">
 
-                        <table class="table table-bordered table-responsive-sm">
+                        <table class="table table-bordered">
                             <thead>
                             <tr>
                                 <th><?= $Lang->get('PERMISSIONS__LABEL') ?></th>
-                                <th><?= $Lang->get('GLOBAL__TYPE_NORMAL') ?></th>
-                                <th><?= $Lang->get('USER__RANK_MODERATOR') ?></th>
-                                <th><?= $Lang->get('USER__RANK_ADMINISTRATOR') ?></th>
                                 <?php
-                                if (!empty($custom_ranks)) {
-                                    foreach ($custom_ranks as $k => $data) {
+                                if (!empty($all_ranks)) {
+                                    foreach ($all_ranks as $k => $data) {
                                         echo '<th>' . $data['Rank']['name'] . '</th>';
                                     }
                                 }
                                 ?>
+                                <th><?= $Lang->get('USER__RANK_ADMINISTRATOR') ?></th>
+
                             </tr>
                             </thead>
                             <tbody>
@@ -36,20 +35,16 @@
                             foreach ($permissions as $permission => $ranks) { ?>
                                 <tr>
                                     <td><?= $Lang->get('PERMISSIONS__' . $permission) ?></td>
-                                    <td><input type="checkbox"
-                                               name="<?= $permission ?>-0"<?= ($ranks[0]) ? ' checked="checked"' : '' ?>>
-                                    </td>
-                                    <td><input type="checkbox"
-                                               name="<?= $permission ?>-2"<?= ($ranks[2]) ? ' checked="checked"' : '' ?>>
-                                    </td>
-                                    <td><input type="checkbox" checked="checked" disabled="disabled"></td>
-                                    <?php if (!empty($custom_ranks)) { ?>
-                                        <?php foreach ($custom_ranks as $k => $data) { ?>
+
+                                    <?php if (!empty($all_ranks)) { ?>
+                                        <?php foreach ($all_ranks as $k => $data) { ?>
                                             <td><input type="checkbox"
                                                        name="<?= $permission ?>-<?= $data['Rank']['rank_id'] ?>"<?= (isset($ranks[$data['Rank']['rank_id']]) && $ranks[$data['Rank']['rank_id']]) ? ' checked="checked"' : '' ?>>
                                             </td>
                                         <?php } ?>
+
                                     <?php } ?>
+                                    <td><input type="checkbox" checked="checked" disabled="disabled"></td>
                                 </tr>
                             <?php } ?>
                             <tr>