diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 88f0613..dd6bfb9 100644
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -23,6 +23,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiAccountCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -33,6 +34,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiAccountUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -45,6 +47,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiAccountL11nCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -55,6 +58,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiAccountL11nUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -68,6 +72,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiCostCenterCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -78,6 +83,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiCostCenterUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -90,6 +96,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiCostCenterL11nCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -100,6 +107,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiCostCenterL11nUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -113,6 +121,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiCostObjectCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -123,6 +132,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiCostObjectUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -135,6 +145,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiCostObjectL11nCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -145,6 +156,7 @@ return [
             'dest'       => '\Modules\Accounting\Controller\ApiController:apiCostObjectL11nUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 42ece06..c211795 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -22,6 +22,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewEntries',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -33,6 +34,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewStackList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -44,6 +46,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewStackEntries',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -55,6 +58,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewStackArchiveList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -66,6 +70,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewStackCreate',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -77,6 +82,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewStackPredefinedList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -88,6 +94,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewAccountView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -99,6 +106,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCOAList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -110,6 +118,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCOACreate',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -121,6 +130,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCostCenterView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -132,6 +142,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCostCenterView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -143,6 +154,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCostCenterView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -154,6 +166,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCostCenterView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -166,6 +179,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCostCenterList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -177,6 +191,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCostObjectList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -188,6 +203,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCostCenterView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -199,6 +215,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCostCenterCreate',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -210,6 +227,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCostObjectView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -221,6 +239,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewCostObjectCreate',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -233,6 +252,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewSupplierList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -244,6 +264,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewClientList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -255,6 +276,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewSupplierView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -266,6 +288,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewClientView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -277,6 +300,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewSupplierView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -288,6 +312,7 @@ return [
         [
             'dest'       => '\Modules\Accounting\Controller\BackendController:viewClientView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 221bfb8..36fcf6d 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -434,7 +434,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Api method to create item attribute l11n
+     * Api method to create account l11n
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -461,7 +461,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Method to create item attribute l11n from request.
+     * Method to create account l11n from request.
      *
      * @param RequestAbstract $request Request
      *
@@ -480,7 +480,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Validate item attribute l11n create request
+     * Validate account l11n create request
      *
      * @param RequestAbstract $request Request
      *
@@ -1162,7 +1162,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Api method to create item attribute l11n
+     * Api method to create CostCenter l11n
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -1189,7 +1189,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Method to create item attribute l11n from request.
+     * Method to create CostCenter l11n from request.
      *
      * @param RequestAbstract $request Request
      *
@@ -1208,7 +1208,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Validate item attribute l11n create request
+     * Validate CostCenter l11n create request
      *
      * @param RequestAbstract $request Request
      *
@@ -1229,7 +1229,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Api method to create item attribute l11n
+     * Api method to create CostObject l11n
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -1256,7 +1256,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Method to create item attribute l11n from request.
+     * Method to create CostObject l11n from request.
      *
      * @param RequestAbstract $request Request
      *
@@ -1275,7 +1275,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Validate item attribute l11n create request
+     * Validate CostObject l11n create request
      *
      * @param RequestAbstract $request Request
      *
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index cb241f9..920ef76 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -573,7 +573,10 @@ final class BackendController extends Controller
             ->with('attributes/type')
             ->with('attributes/type/l11n')
             ->with('attributes/value')
+            ->with('attributes/value/l11n')
             ->where('id', (int) $request->getData('id'))
+            ->where('attributes/type/l11n/language', $response->header->l11n->language)
+            ->where('attributes/value/l11n/language', [$response->header->l11n->language, null])
             ->execute();
 
         $view->data['fiAccounts'] = AccountAbstractMapper::getAll()
@@ -679,7 +682,10 @@ final class BackendController extends Controller
             ->with('attributes/type')
             ->with('attributes/type/l11n')
             ->with('attributes/value')
+            ->with('attributes/value/l11n')
             ->where('id', (int) $request->getData('id'))
+            ->where('attributes/type/l11n/language', $response->header->l11n->language)
+            ->where('attributes/value/l11n/language', [$response->header->l11n->language, null])
             ->execute();
 
         $view->data['fiAccounts'] = AccountAbstractMapper::getAll()
diff --git a/Theme/Backend/costcenter-view.tpl.php b/Theme/Backend/costcenter-view.tpl.php
index a11f918..54781cd 100644
--- a/Theme/Backend/costcenter-view.tpl.php
+++ b/Theme/Backend/costcenter-view.tpl.php
@@ -21,7 +21,7 @@ echo $this->data['nav']->render(); ?>
 
                     <div class="form-group">
                         <label for="iCode"><?= $this->getHtml('Code'); ?></label>
-                        <input type="text" name="code" id="iCode" value="<?= $this->printHtml($costcenter->code); ?>">
+                        <input type="text" name="code" id="iCode" value="<?= $this->printHtml($costcenter->code); ?>" required>
                     </div>
 
                     <div class="form-group">
@@ -31,7 +31,7 @@ echo $this->data['nav']->render(); ?>
 
                     <div class="form-group">
                         <label for="iName"><?= $this->getHtml('Name'); ?></label>
-                        <input type="text" name="Name" id="iName" value="<?= $this->printHtml($costcenter->getL11n()); ?>" disabled>
+                        <input type="text" name="Name" id="iName" value="<?= $this->printHtml($costcenter->getL11n()); ?>"<?php $isNew ? '' : ' disabled'; ?>>
                     </div>
                 </div>
                 <div class="portlet-foot">
diff --git a/Theme/Backend/costobject-view.tpl.php b/Theme/Backend/costobject-view.tpl.php
index d475742..31c7a17 100644
--- a/Theme/Backend/costobject-view.tpl.php
+++ b/Theme/Backend/costobject-view.tpl.php
@@ -21,7 +21,7 @@ echo $this->data['nav']->render(); ?>
 
                     <div class="form-group">
                         <label for="iCode"><?= $this->getHtml('Code'); ?></label>
-                        <input type="text" name="code" id="iCode" value="<?= $this->printHtml($costobject->code); ?>">
+                        <input type="text" name="code" id="iCode" value="<?= $this->printHtml($costobject->code); ?>" required>
                     </div>
 
                     <div class="form-group">
@@ -31,7 +31,7 @@ echo $this->data['nav']->render(); ?>
 
                     <div class="form-group">
                         <label for="iName"><?= $this->getHtml('Name'); ?></label>
-                        <input type="text" name="Name" id="iName" value="<?= $this->printHtml($costobject->getL11n()); ?>" disabled>
+                        <input type="text" name="Name" id="iName" value="<?= $this->printHtml($costobject->getL11n()); ?>"<?php $isNew ? '' : ' disabled'; ?>>
                     </div>
                 </div>
                 <div class="portlet-foot">