diff --git a/CHANGELOG.md b/CHANGELOG.md
index fab6c36..302886e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
  - Fix #168: Fix spelling in russian language (EvgenyOrekhov)
  - Fix #195: UserCreateService: check if we're from web before setting flash message (maxxer)
  - Enh: Improvements to the admin responsive design (wautvda)
+ - Enh: Add controller module class reference (TonisOrmisson)
  - Enh: Replace the deprecated InvalidParamException in ClassMapHelper (TonisOrmisson)
  
 ## 1.1.4 - February 19, 2018
diff --git a/src/User/Controller/AdminController.php b/src/User/Controller/AdminController.php
index 8a7ec8b..660e74f 100644
--- a/src/User/Controller/AdminController.php
+++ b/src/User/Controller/AdminController.php
@@ -25,6 +25,7 @@ use Da\User\Service\UserBlockService;
 use Da\User\Service\UserConfirmationService;
 use Da\User\Service\UserCreateService;
 use Da\User\Traits\ContainerAwareTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Da\User\Validator\AjaxRequestModelValidator;
 use Yii;
 use yii\base\Module;
@@ -37,6 +38,7 @@ use yii\web\Controller;
 class AdminController extends Controller
 {
     use ContainerAwareTrait;
+    use ModuleAwareTrait;
 
     /**
      * @var UserQuery
@@ -300,9 +302,7 @@ class AdminController extends Controller
 
     public function actionSwitchIdentity($id = null)
     {
-        /** @var \Da\User\Module $module */
-        $module = $this->module;
-        if (false === $module->enableSwitchIdentities) {
+        if (false === $this->module->enableSwitchIdentities) {
             Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'Switch identities is disabled.'));
 
             return $this->redirect(['index']);
diff --git a/src/User/Controller/RecoveryController.php b/src/User/Controller/RecoveryController.php
index 00e4ec7..33c19ee 100644
--- a/src/User/Controller/RecoveryController.php
+++ b/src/User/Controller/RecoveryController.php
@@ -22,6 +22,7 @@ use Da\User\Query\UserQuery;
 use Da\User\Service\PasswordRecoveryService;
 use Da\User\Service\ResetPasswordService;
 use Da\User\Traits\ContainerAwareTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Da\User\Validator\AjaxRequestModelValidator;
 use Yii;
 use yii\base\InvalidConfigException;
@@ -33,10 +34,12 @@ use yii\web\NotFoundHttpException;
 class RecoveryController extends Controller
 {
     use ContainerAwareTrait;
+    use ModuleAwareTrait;
 
     protected $userQuery;
     protected $tokenQuery;
 
+
     /**
      * RecoveryController constructor.
      *
diff --git a/src/User/Controller/RegistrationController.php b/src/User/Controller/RegistrationController.php
index f321413..424d8b0 100644
--- a/src/User/Controller/RegistrationController.php
+++ b/src/User/Controller/RegistrationController.php
@@ -27,6 +27,7 @@ use Da\User\Service\UserConfirmationService;
 use Da\User\Service\UserCreateService;
 use Da\User\Service\UserRegisterService;
 use Da\User\Traits\ContainerAwareTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Da\User\Validator\AjaxRequestModelValidator;
 use Yii;
 use yii\base\Module;
@@ -37,10 +38,12 @@ use yii\web\NotFoundHttpException;
 class RegistrationController extends Controller
 {
     use ContainerAwareTrait;
+    use ModuleAwareTrait;
 
     protected $userQuery;
     protected $socialNetworkAccountQuery;
 
+
     /**
      * RegistrationController constructor.
      *
diff --git a/src/User/Controller/SecurityController.php b/src/User/Controller/SecurityController.php
index 403e406..5412e5f 100644
--- a/src/User/Controller/SecurityController.php
+++ b/src/User/Controller/SecurityController.php
@@ -19,6 +19,7 @@ use Da\User\Query\SocialNetworkAccountQuery;
 use Da\User\Service\SocialNetworkAccountConnectService;
 use Da\User\Service\SocialNetworkAuthenticateService;
 use Da\User\Traits\ContainerAwareTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\authclient\AuthAction;
 use yii\base\InvalidConfigException;
@@ -33,9 +34,11 @@ use yii\widgets\ActiveForm;
 class SecurityController extends Controller
 {
     use ContainerAwareTrait;
+    use ModuleAwareTrait;
 
     protected $socialNetworkAccountQuery;
 
+
     /**
      * SecurityController constructor.
      *
diff --git a/src/User/Controller/SettingsController.php b/src/User/Controller/SettingsController.php
index 3ada228..a4f891f 100644
--- a/src/User/Controller/SettingsController.php
+++ b/src/User/Controller/SettingsController.php
@@ -30,6 +30,7 @@ use Da\User\Query\UserQuery;
 use Da\User\Service\EmailChangeService;
 use Da\User\Service\TwoFactorQrCodeUriGeneratorService;
 use Da\User\Traits\ContainerAwareTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Da\User\Validator\AjaxRequestModelValidator;
 use Da\User\Validator\TwoFactorCodeValidator;
 use Yii;
@@ -44,6 +45,7 @@ use yii\web\Response;
 class SettingsController extends Controller
 {
     use ContainerAwareTrait;
+    use ModuleAwareTrait;
 
     /**
      * {@inheritdoc}
@@ -54,6 +56,7 @@ class SettingsController extends Controller
     protected $userQuery;
     protected $socialNetworkAccountQuery;
 
+
     /**
      * SettingsController constructor.
      *