diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index d0a0dea..fec2a8e 100755
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -23,6 +23,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiDataChange',
             'verb'       => RouteVerb::ANY,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
             ],
         ],
@@ -32,6 +33,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiLogin',
             'verb'       => RouteVerb::SET,
+            'active' => true,
             'permission' => [
             ],
         ],
@@ -40,6 +42,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountRegister',
             'verb'       => RouteVerb::SET,
+            'active' => true,
             'permission' => [
             ],
         ],
@@ -50,6 +53,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiLogout',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
             ],
         ],
@@ -59,6 +63,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiForgot',
             'verb'       => RouteVerb::SET,
+            'active' => true,
             'permission' => [
             ],
         ],
@@ -67,6 +72,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiResetPassword',
             'verb'       => RouteVerb::SET,
+            'active' => true,
             'permission' => [
             ],
         ],
@@ -77,6 +83,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiSettingsSet',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -87,6 +94,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiSettingsGet',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -100,6 +108,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiSettingsDesignSet',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -113,6 +122,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -123,6 +133,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -133,6 +144,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupDelete',
             'verb'       => RouteVerb::DELETE,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::DELETE,
@@ -143,6 +155,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupGet',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -156,6 +169,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountFind',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -168,6 +182,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupFind',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -180,6 +195,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountGroupFind',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -193,6 +209,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -203,6 +220,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -213,6 +231,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountDelete',
             'verb'       => RouteVerb::DELETE,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::DELETE,
@@ -223,6 +242,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountGet',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -235,6 +255,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiSettingsAccountLocalizationSet',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -248,6 +269,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiModuleStatusUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -261,6 +283,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAddAccountToGroup',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -273,6 +296,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAddGroupToAccount',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -286,6 +310,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupPermissionGet',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -296,6 +321,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAddGroupPermission',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -306,6 +332,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupPermissionUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -316,6 +343,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupPermissionDelete',
             'verb'       => RouteVerb::DELETE,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -328,6 +356,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountPermissionGet',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -338,6 +367,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAddAccountPermission',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -348,6 +378,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountPermissionUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -358,6 +389,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountPermissionDelete',
             'verb'       => RouteVerb::DELETE,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -370,6 +402,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiReInit',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -383,6 +416,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiUpdateFile',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -395,6 +429,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -407,6 +442,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -419,6 +455,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiAddressCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -429,6 +466,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiAddressUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -439,6 +477,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiAddressDelete',
             'verb'       => RouteVerb::DELETE,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::DELETE,
@@ -451,6 +490,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiContactCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -461,6 +501,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiContactUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -471,6 +512,7 @@ return [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiContactDelete',
             'verb'       => RouteVerb::DELETE,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::DELETE,
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 9b46bbc..e5e5d84 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -22,6 +22,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewForgot',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
             ],
         ],
@@ -31,6 +32,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewModuleSettings',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -43,6 +45,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewAccountList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -54,6 +57,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewAccountSettings',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -65,6 +69,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewAccountCreate',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -76,6 +81,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewGroupList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -87,6 +93,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewGroupSettings',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -98,6 +105,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewGroupCreate',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -109,6 +117,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewModuleList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -120,6 +129,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewModuleInfo',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -131,6 +141,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewModuleLog',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -142,6 +153,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewModuleRouteList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -153,6 +165,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\BackendController:viewModuleHookList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
diff --git a/Models/PermissionAbstractMapper.php b/Models/PermissionAbstractMapper.php
index 4f05f6f..d9ce389 100755
--- a/Models/PermissionAbstractMapper.php
+++ b/Models/PermissionAbstractMapper.php
@@ -18,7 +18,7 @@ use phpOMS\DataStorage\Database\Connection\ConnectionAbstract;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
- * Mapper class.
+ * Permission mapper class.
  *
  * @package Modules\Admin\Models
  * @license OMS License 2.0
diff --git a/Theme/Backend/accounts-view.tpl.php b/Theme/Backend/accounts-view.tpl.php
index d73b761..b069a3a 100644
--- a/Theme/Backend/accounts-view.tpl.php
+++ b/Theme/Backend/accounts-view.tpl.php
@@ -220,6 +220,7 @@ echo $this->data['nav']->render(); ?>
                                     <label for="iPermissionId"><?= $this->getHtml('ID', '0', '0'); ?></label>
                                     <input id="iPermissionId" name="permissionref" type="text" data-tpl-text="/id" data-tpl-value="/id" disabled>
                                 </div>
+
                                 <div class="form-group">
                                     <label for="iPermissionUnit"><?= $this->getHtml('Unit'); ?></label>
                                     <select id="iPermissionUnit" name="permissionunit" data-tpl-text="/unit" data-tpl-value="/unit">
@@ -230,6 +231,7 @@ echo $this->data['nav']->render(); ?>
                                         <?php endforeach; ?>
                                     </select>
                                 </div>
+
                                 <div class="form-group">
                                     <label for="iPermissionApp"><?= $this->getHtml('App'); ?></label>
                                     <select id="iPermissionApp" name="permissionapp" data-tpl-text="/app" data-tpl-value="/app">
@@ -240,6 +242,7 @@ echo $this->data['nav']->render(); ?>
                                         <?php endforeach; ?>
                                     </select>
                                 </div>
+
                                 <div class="form-group">
                                     <label for="iPermissionModule"><?= $this->getHtml('Module'); ?></label>
                                     <select id="iPermissionModule" name="permissionmodule" data-tpl-text="/module" data-tpl-value="/module">
@@ -250,18 +253,22 @@ echo $this->data['nav']->render(); ?>
                                         <?php endforeach; ?>
                                     </select>
                                 </div>
+
                                 <div class="form-group">
                                     <label for="iPermissionType"><?= $this->getHtml('Type'); ?></label>
                                     <input id="iPermissionType" name="permissiontype" type="text" data-tpl-text="/type" data-tpl-value="/type">
                                 </div>
+
                                 <div class="form-group">
                                     <label for="iPermissionElement"><?= $this->getHtml('Element'); ?></label>
                                     <input id="iPermissionElement" name="permissionelement" type="text" data-tpl-text="/ele" data-tpl-value="/ele">
                                 </div>
+
                                 <div class="form-group">
                                     <label for="iPermissionComponent"><?= $this->getHtml('Component'); ?></label>
                                     <input id="iPermissionComponent" name="permissioncomponent" type="text" data-tpl-text="/comp" data-tpl-value="/comp">
                                 </div>
+
                                 <div class="form-group">
                                     <label><?= $this->getHtml('Permission'); ?></label>
                                     <span class="checkbox">