diff --git a/core/lib/Thelia/Controller/Admin/AdminController.php b/core/lib/Thelia/Controller/Admin/AdminController.php
index 46cee94a0..41be586d7 100755
--- a/core/lib/Thelia/Controller/Admin/AdminController.php
+++ b/core/lib/Thelia/Controller/Admin/AdminController.php
@@ -23,9 +23,7 @@
 
 namespace Thelia\Admin\Controller;
 
-use Thelia\Controller\BaseController;
-
-class AdminController extends BaseController {
+class AdminController extends BaseAdminController {
 
     public function indexAction()
     {
diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php
index 4fccc44b5..d2054e1c0 100644
--- a/core/lib/Thelia/Controller/Admin/CategoryController.php
+++ b/core/lib/Thelia/Controller/Admin/CategoryController.php
@@ -26,9 +26,8 @@ namespace Thelia\Admin\Controller;
 use Thelia\Model\CategoryQuery;
 use Thelia\Core\Security\Exception\AuthenticationException;
 use Thelia\Core\Security\Exception\AuthorizationException;
-use Thelia\Controller\BaseController;
 
-class CategoryController extends BaseController {
+class CategoryController extends BaseAdminController {
 
 	protected function createNewCategory($args) {
 		$this->dispatchEvent("createCategory");
diff --git a/core/lib/Thelia/Controller/Admin/SessionController.php b/core/lib/Thelia/Controller/Admin/SessionController.php
index 633ff80a1..75d102bdb 100755
--- a/core/lib/Thelia/Controller/Admin/SessionController.php
+++ b/core/lib/Thelia/Controller/Admin/SessionController.php
@@ -32,9 +32,8 @@ use Symfony\Component\Validator\Exception\ValidatorException;
 use Thelia\Tools\URL;
 use Thelia\Tools\Redirect;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Controller\BaseController;
 
-class SessionController extends BaseController {
+class SessionController extends BaseAdminController {
 
 	public function showLoginAction()
 	{
diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/core/lib/Thelia/Controller/Front/CustomerController.php
index e0fb2fc3d..4fd89343e 100644
--- a/core/lib/Thelia/Controller/Front/CustomerController.php
+++ b/core/lib/Thelia/Controller/Front/CustomerController.php
@@ -29,7 +29,7 @@ use Thelia\Core\Security\SecurityContext;
 use Thelia\Model\Customer;
 use Thelia\Core\Event\TheliaEvents;
 
-class CustomerController extends BaseController {
+class CustomerController extends BaseFrontController {
 
     public function createAction()
     {