diff --git a/config/app.php b/config/app.php
index 76f6844..e9119b4 100644
--- a/config/app.php
+++ b/config/app.php
@@ -59,7 +59,6 @@ return [
         'user' => [
             'class' => 'app\modules\user\Module',
             'controllerMap' => [
-                'admin' => 'app\overrides\user\controllers\AdminController',
                 'default' => 'app\overrides\user\controllers\DefaultController',
             ]
         ],
diff --git a/modules/user/controllers/AdminController.php b/modules/user/controllers/AdminController.php
index a88e4c2..c9155a3 100644
--- a/modules/user/controllers/AdminController.php
+++ b/modules/user/controllers/AdminController.php
@@ -79,7 +79,7 @@ class AdminController extends \Piko\Controller
         }
 
         $user->scenario = User::SCENARIO_ADMIN;
-        $message = false;
+        $message = [];
 
         $post = $this->request->getParsedBody();
 
diff --git a/overrides/user/controllers/AdminController.php b/overrides/user/controllers/AdminController.php
deleted file mode 100644
index f6b46cd..0000000
--- a/overrides/user/controllers/AdminController.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace app\overrides\user\controllers;
-
-use app\overrides\user\models\User;
-use function Piko\I18n\__;
-use app\modules\user\models\Role;
-
-class AdminController extends \app\modules\user\controllers\AdminController
-{
-       /**
-     * Render User form and create or update user
-     *
-     * @return string
-     */
-    public function editAction(int $id = 0)
-    {
-        $user = new User($this->db);
-
-        if ($id) {
-            $user->load($id);
-        }
-
-        $user->scenario = User::SCENARIO_ADMIN;
-        $message = [];
-
-        $post = $this->request->getParsedBody();
-
-        if (!empty($post)) {
-
-            $user->bind($post);
-
-            if ($user->isValid() && $user->save()) {
-                $message['type'] = 'success';
-                $message['content'] = __('user', 'User successfully saved');
-            } else {
-                $message['type'] = 'danger';
-                $message['content'] = __('user', 'Save error!') . implode(' ', $user->errors);
-            }
-        }
-        
-
-        return $this->render('edit', [
-            'user' => $user,
-            'message' => $message,
-            'roles' => Role::find('`name` ASC'),
-        ]);
-    }
-}