diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba44bb8..41856fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,20 @@
 # CHANGELOG
 
-## 1.1.1 - Work in progress
-- Enh #99: Added German translation (jkmssoft)
+## 1.1.2 - Work in progress
+- Bug #125: Fix validation in non-ajax requests (faenir)
+- Bug #122: Fix wrong email message for email address change (liviuk2)
+
+## 1.1.1 - November 27, 2017
+- Bug #115: Convert client_id to string because pgsql fail with type convertion (Dezinger)
+- Bug #119: Security fix: add AccessControl to RuleController (Dezinger)
+- Enh #120: 2FA i18n russian translation (Dezinger)
+- Bug #111: Fix migration for PostgreSQL DBMS (MKiselev)
+- Bug #106: Correct exception value returned in `MailEvent::getException` (kartik-v)
+- Enh #99:  Added German translation (jkmssoft)
 - Enh #100: Added pt-BR translation (gugoan)
+- Enh #105: Consolidate 2fa messages (maxxer)
+- Fix #108: Use main logger app (tonydspaniard)
+- Enh #109: Make use of better classes names (tonydspaniard)
 
 ## 1.1.0 - October 22, 2017
 - Enh #91: Documentation for Mail events (kartik-v)
diff --git a/docs/helpful-guides/how-to-implement-two-factor-auth.md b/docs/helpful-guides/how-to-implement-two-factor-auth.md
index da9ed9b..53ebf79 100644
--- a/docs/helpful-guides/how-to-implement-two-factor-auth.md
+++ b/docs/helpful-guides/how-to-implement-two-factor-auth.md
@@ -1,18 +1,18 @@
-How to Implement Two-Factor Auth
-================================
+How to Implement Two Factor Auth (2FA)
+======================================
 
-Two-Factor Authentication products add an additional layer of security. Typically, users are asked to prove their 
+Two Factor Authentication products add an additional layer of security. Typically, users are asked to prove their 
 identity by providing simple credentials such as an email address and a password. A second factor (2F) adds an extra 
 layer of unauthorized access protection by prompting the user to provide an additional means of authentication such as 
 a physical token (e.g. a card) or an additional secret that only they know.
 
-With this module is quite easy. It basically implements two-factor authentication using the following 2amigos libraries: 
+With this module is quite easy. It basically implements two factor authentication using the following 2amigos libraries: 
 
 - [2amigos/2fa-library](https://github.com/2amigos/2fa-library)
 - [2amigos/qrcode-library](https://github.com/2amigos/qrcode-library)
 
 
-Enable Two-Factor 
+Enable Two Factor 
 -----------------
 
 We simply need to enable two factor authentication: 
@@ -26,7 +26,7 @@ We simply need to enable two factor authentication:
 ]
 ```
 
-Now, when the user go to its settings via `user/settings`, it will display the option to enable two-factor 
+Now, when the user go to its settings via `user/settings`, it will display the option to enable two factor 
 authentication or not. 
 
 When enabled, the module will show a modal with a QrCode that has to be scanned by the Google Authenticator App 
@@ -35,15 +35,15 @@ When enabled, the module will show a modal with a QrCode that has to be scanned
 [iTunes](https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8)). 
 
 The application will display a code that needs to be inserted into the modal input box. If code verification goes well, 
-it will enable the two-factor for the user. 
+it will enable the two factor for the user. 
 
-If a user has enabled the two-factor, and after successfully login via username and email, it will render a new section 
+If a user has enabled the two factor, and after successfully login via username and email, it will render a new section 
 where user will have to enter the code displayed on its Google Authenticator App in order to complete with the login 
 process. 
 
 
 ### Recommended Reading
 
-- [2amigos Two-Factor Library Docs]()http://2fa-library.readthedocs.io/en/latest/)
+- [2amigos Two Factor Library Docs]()http://2fa-library.readthedocs.io/en/latest/)
 
 © [2amigos](http://www.2amigos.us/) 2013-2017
diff --git a/docs/helpful-guides/social-network-authentication.md b/docs/helpful-guides/social-network-authentication.md
index 8c50641..8a9552a 100644
--- a/docs/helpful-guides/social-network-authentication.md
+++ b/docs/helpful-guides/social-network-authentication.md
@@ -31,7 +31,7 @@ After you need to configure the `authClientCollection::clients` on your Applicat
             'facebook' => [
                 'class' => 'Da\User\AuthClient\Facebook',
                 'clientId' => 'facebook_client_id',
-                'clientScret' => 'facebook_client_secret'
+                'clientSecret' => 'facebook_client_secret'
             ]
         ]
     ]
diff --git a/src/User/Bootstrap.php b/src/User/Bootstrap.php
index 18fb8d2..86c0c8f 100644
--- a/src/User/Bootstrap.php
+++ b/src/User/Bootstrap.php
@@ -20,6 +20,7 @@ use yii\authclient\Collection;
 use yii\base\Application;
 use yii\base\BootstrapInterface;
 use yii\base\Exception;
+use yii\base\InvalidConfigException;
 use yii\console\Application as ConsoleApplication;
 use yii\i18n\PhpMessageSource;
 use yii\web\Application as WebApplication;
@@ -36,6 +37,8 @@ class Bootstrap implements BootstrapInterface
 {
     /**
      * {@inheritdoc}
+     *
+     * @throws InvalidConfigException
      */
     public function bootstrap($app)
     {
@@ -178,6 +181,8 @@ class Bootstrap implements BootstrapInterface
      * Registers module translation messages.
      *
      * @param Application $app
+     *
+     * @throws InvalidConfigException
      */
     protected function initTranslations(Application $app)
     {
@@ -194,6 +199,8 @@ class Bootstrap implements BootstrapInterface
      * Ensures the auth manager is the one provided by the library.
      *
      * @param Application $app
+     *
+     * @throws InvalidConfigException
      */
     protected function initAuthManager(Application $app)
     {
@@ -211,6 +218,8 @@ class Bootstrap implements BootstrapInterface
      * Initializes web url routes (rules in Yii2).
      *
      * @param WebApplication $app
+     *
+     * @throws InvalidConfigException
      */
     protected function initUrlRoutes(WebApplication $app)
     {
@@ -253,6 +262,8 @@ class Bootstrap implements BootstrapInterface
      * Ensures the authCollection component is configured.
      *
      * @param WebApplication $app
+     *
+     * @throws InvalidConfigException
      */
     protected function initAuthCollection(WebApplication $app)
     {
@@ -287,6 +298,7 @@ class Bootstrap implements BootstrapInterface
      *
      * @param array $userClassMap user configuration on the module
      *
+     * @throws Exception
      * @return array
      */
     protected function buildClassMap(array $userClassMap)
@@ -360,7 +372,7 @@ class Bootstrap implements BootstrapInterface
     protected function getRoute(array $routes, $name)
     {
         foreach ($routes as $route => $names) {
-            if (in_array($name, $names)) {
+            if (in_array($name, $names, false)) {
                 return $route;
             }
         }
diff --git a/src/User/Component/AuthDbManagerComponent.php b/src/User/Component/AuthDbManagerComponent.php
index 7422e58..49f7686 100644
--- a/src/User/Component/AuthDbManagerComponent.php
+++ b/src/User/Component/AuthDbManagerComponent.php
@@ -68,7 +68,6 @@ class AuthDbManagerComponent extends DbManager implements AuthManagerInterface
         $roles = [];
         foreach ($query->all($this->db) as $row) {
             $roles[$row['name']] = $this->populateItem($row);
-            $roles[$row['name']] = $this->populateItem($row);
         }
 
         return $roles;
diff --git a/src/User/Component/ReCaptchaComponent.php b/src/User/Component/ReCaptchaComponent.php
index 31f57a5..62009a2 100644
--- a/src/User/Component/ReCaptchaComponent.php
+++ b/src/User/Component/ReCaptchaComponent.php
@@ -29,6 +29,8 @@ class ReCaptchaComponent extends Component
 
     /**
      * @inheritdoc
+     *
+     * @throws InvalidConfigException
      */
     public function init()
     {
diff --git a/src/User/Controller/AdminController.php b/src/User/Controller/AdminController.php
index 9af1113..8a7ec8b 100644
--- a/src/User/Controller/AdminController.php
+++ b/src/User/Controller/AdminController.php
@@ -131,7 +131,7 @@ class AdminController extends Controller
 
         $this->make(AjaxRequestModelValidator::class, [$user])->validate();
 
-        if ($user->load(Yii::$app->request->post())) {
+        if ($user->load(Yii::$app->request->post()) && $user->validate()) {
             $this->trigger(UserEvent::EVENT_BEFORE_CREATE, $event);
 
             $mailService = MailFactory::makeWelcomeMailerService($user);
@@ -140,9 +140,8 @@ class AdminController extends Controller
                 Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'User has been created'));
                 $this->trigger(UserEvent::EVENT_AFTER_CREATE, $event);
                 return $this->redirect(['update', 'id' => $user->id]);
-            } else {
-                Yii::$app->session->setFlash('danger', Yii::t('usuario', 'User account could not be created.'));
             }
+            Yii::$app->session->setFlash('danger', Yii::t('usuario', 'User account could not be created.'));
         }
 
         return $this->render('create', ['user' => $user]);
diff --git a/src/User/Controller/PermissionController.php b/src/User/Controller/PermissionController.php
index fef9eb4..40fd707 100644
--- a/src/User/Controller/PermissionController.php
+++ b/src/User/Controller/PermissionController.php
@@ -35,6 +35,8 @@ class PermissionController extends AbstractAuthItemController
 
     /**
      * {@inheritdoc}
+     *
+     * @throws NotFoundHttpException
      */
     protected function getItem($name)
     {
diff --git a/src/User/Controller/RecoveryController.php b/src/User/Controller/RecoveryController.php
index 1e8e86d..cd2f621 100644
--- a/src/User/Controller/RecoveryController.php
+++ b/src/User/Controller/RecoveryController.php
@@ -24,6 +24,8 @@ use Da\User\Service\ResetPasswordService;
 use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Validator\AjaxRequestModelValidator;
 use Yii;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
 use yii\filters\AccessControl;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
@@ -74,6 +76,8 @@ class RecoveryController extends Controller
      * Displays / handles user password recovery request.
      *
      * @throws NotFoundHttpException
+     * @throws InvalidConfigException
+     * @throws InvalidParamException
      * @return string
      *
      */
@@ -90,7 +94,7 @@ class RecoveryController extends Controller
 
         $this->make(AjaxRequestModelValidator::class, [$form])->validate();
 
-        if ($form->load(Yii::$app->request->post())) {
+        if ($form->load(Yii::$app->request->post()) && $form->validate()) {
             $this->trigger(FormEvent::EVENT_BEFORE_REQUEST, $event);
 
             $mailService = MailFactory::makeRecoveryMailerService($form->email);
@@ -118,6 +122,8 @@ class RecoveryController extends Controller
      * @param $code
      *
      * @throws NotFoundHttpException
+     * @throws InvalidConfigException
+     * @throws InvalidParamException
      * @return string
      *
      */
diff --git a/src/User/Controller/RegistrationController.php b/src/User/Controller/RegistrationController.php
index 595db3d..2834f9d 100644
--- a/src/User/Controller/RegistrationController.php
+++ b/src/User/Controller/RegistrationController.php
@@ -121,9 +121,8 @@ class RegistrationController extends Controller
                         'module' => $this->module,
                     ]
                 );
-            } else {
-                Yii::$app->session->setFlash('danger', Yii::t('usuario', 'User could not be registered.'));
             }
+            Yii::$app->session->setFlash('danger', Yii::t('usuario', 'User could not be registered.'));
         }
         return $this->render('register', ['model' => $form, 'module' => $this->module]);
     }
@@ -146,7 +145,7 @@ class RegistrationController extends Controller
 
         $this->make(AjaxRequestModelValidator::class, [$user])->validate();
 
-        if ($user->load(Yii::$app->request->post())) {
+        if ($user->load(Yii::$app->request->post()) && $user->validate()) {
             $this->trigger(SocialNetworkConnectEvent::EVENT_BEFORE_CONNECT, $event);
 
             $mailService = MailFactory::makeWelcomeMailerService($user);
diff --git a/src/User/Controller/RoleController.php b/src/User/Controller/RoleController.php
index 1490ca3..938ce80 100644
--- a/src/User/Controller/RoleController.php
+++ b/src/User/Controller/RoleController.php
@@ -35,6 +35,8 @@ class RoleController extends AbstractAuthItemController
 
     /**
      * {@inheritdoc}
+     *
+     * @throws NotFoundHttpException
      */
     protected function getItem($name)
     {
diff --git a/src/User/Controller/RuleController.php b/src/User/Controller/RuleController.php
index dbce6c2..ccd6134 100644
--- a/src/User/Controller/RuleController.php
+++ b/src/User/Controller/RuleController.php
@@ -17,10 +17,12 @@ use Da\User\Service\AuthRuleEditionService;
 use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Validator\AjaxRequestModelValidator;
+use Da\User\Filter\AccessRuleFilter;
 use Yii;
 use yii\filters\VerbFilter;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
+use yii\filters\AccessControl;
 
 class RuleController extends Controller
 {
@@ -33,12 +35,24 @@ class RuleController extends Controller
     public function behaviors()
     {
         return [
-            [
+            'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
                     'delete' => ['POST'],
                 ],
-            ]
+            ],
+            'access' => [
+                'class' => AccessControl::className(),
+                'ruleConfig' => [
+                    'class' => AccessRuleFilter::className(),
+                ],
+                'rules' => [
+                    [
+                        'allow' => true,
+                        'roles' => ['admin'],
+                    ],
+                ],
+            ],
         ];
     }
 
diff --git a/src/User/Controller/SecurityController.php b/src/User/Controller/SecurityController.php
index 55631a9..6d0826f 100644
--- a/src/User/Controller/SecurityController.php
+++ b/src/User/Controller/SecurityController.php
@@ -21,6 +21,8 @@ use Da\User\Service\SocialNetworkAuthenticateService;
 use Da\User\Traits\ContainerAwareTrait;
 use Yii;
 use yii\authclient\AuthAction;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
 use yii\base\Module;
 use yii\filters\AccessControl;
 use yii\filters\VerbFilter;
@@ -102,6 +104,8 @@ class SecurityController extends Controller
     /**
      * Controller action responsible for handling login page and actions.
      *
+     * @throws InvalidConfigException
+     * @throws InvalidParamException
      * @return array|string|Response
      */
     public function actionLogin()
diff --git a/src/User/Controller/SettingsController.php b/src/User/Controller/SettingsController.php
index f8fb71b..dae065d 100644
--- a/src/User/Controller/SettingsController.php
+++ b/src/User/Controller/SettingsController.php
@@ -179,7 +179,7 @@ class SettingsController extends Controller
     {
         $user = $this->userQuery->whereId($id)->one();
 
-        if ($user === null || $this->module->emailChangeStrategy == MailChangeStrategyInterface::TYPE_INSECURE) {
+        if ($user === null || MailChangeStrategyInterface::TYPE_INSECURE === $this->module->emailChangeStrategy) {
             throw new NotFoundHttpException();
         }
         $event = $this->make(UserEvent::class, [$user]);
@@ -210,7 +210,7 @@ class SettingsController extends Controller
         if ($account === null) {
             throw new NotFoundHttpException();
         }
-        if ($account->user_id != Yii::$app->user->id) {
+        if ($account->user_id !== Yii::$app->user->id) {
             throw new ForbiddenHttpException();
         }
         $event = $this->make(SocialNetworkConnectEvent::class, [Yii::$app->user->identity, $account]);
@@ -280,7 +280,7 @@ class SettingsController extends Controller
         return [
             'success' => $success,
             'message' => $success
-                ? Yii::t('usuario', 'Two factor successfully enabled.')
+                ? Yii::t('usuario', 'Two factor authentication successfully enabled.')
                 : Yii::t('usuario', 'Verification failed. Please, enter new code.')
         ];
     }
@@ -297,11 +297,11 @@ class SettingsController extends Controller
         if ($user->updateAttributes(['auth_tf_enabled' => '0'])) {
             Yii::$app
                 ->getSession()
-                ->setFlash('success', Yii::t('usuario', 'Two-factor authorization has been disabled.'));
+                ->setFlash('success', Yii::t('usuario', 'Two factor authentication has been disabled.'));
         } else {
             Yii::$app
                 ->getSession()
-                ->setFlash('danger', Yii::t('usuario', 'Unable to disable two-factor authorization.'));
+                ->setFlash('danger', Yii::t('usuario', 'Unable to disable Two factor authentication.'));
         }
 
         $this->redirect(['account']);
diff --git a/src/User/Event/MailEvent.php b/src/User/Event/MailEvent.php
index 75bce1a..8ebe5f8 100644
--- a/src/User/Event/MailEvent.php
+++ b/src/User/Event/MailEvent.php
@@ -15,11 +15,6 @@ use Da\User\Model\User;
 use Da\User\Service\MailService;
 use yii\base\Event;
 
-/**
- * Mailer event to trap and handle mail exceptions for user model actions
- *
- * @author Kartik Visweswaran <kartikv2@gmail.com>
- */
 class MailEvent extends Event
 {
     const TYPE_WELCOME = 'welcome';
@@ -62,6 +57,6 @@ class MailEvent extends Event
 
     public function getException()
     {
-        return $this->mailService;
+        return $this->exception;
     }
 }
diff --git a/src/User/Event/ProfileEvent.php b/src/User/Event/ProfileEvent.php
index 7a19f29..902c276 100644
--- a/src/User/Event/ProfileEvent.php
+++ b/src/User/Event/ProfileEvent.php
@@ -22,7 +22,7 @@ class ProfileEvent extends Event
     {
         $this->profile = $profile;
 
-        return parent::__construct($config);
+        parent::__construct($config);
     }
 
     public function getProfile()
diff --git a/src/User/Factory/EmailChangeStrategyFactory.php b/src/User/Factory/EmailChangeStrategyFactory.php
index 15e929e..3253df6 100644
--- a/src/User/Factory/EmailChangeStrategyFactory.php
+++ b/src/User/Factory/EmailChangeStrategyFactory.php
@@ -18,6 +18,7 @@ use Da\User\Strategy\InsecureEmailChangeStrategy;
 use Da\User\Strategy\SecureEmailChangeStrategy;
 use Exception;
 use Yii;
+use yii\base\InvalidParamException;
 
 class EmailChangeStrategyFactory
 {
@@ -41,7 +42,7 @@ class EmailChangeStrategyFactory
             return Yii::$container->get(static::$map[$strategy], [$form]);
         }
 
-        throw new Exception('Unknown strategy type');
+        throw new InvalidParamException('Unknown strategy type');
     }
 
     /**
diff --git a/src/User/Factory/MailFactory.php b/src/User/Factory/MailFactory.php
index aea6550..13fd3e5 100644
--- a/src/User/Factory/MailFactory.php
+++ b/src/User/Factory/MailFactory.php
@@ -17,19 +17,15 @@ use Da\User\Model\User;
 use Da\User\Module;
 use Da\User\Service\MailService;
 use Yii;
+use yii\base\InvalidConfigException;
 
-/**
- * Class MailFactory
- *
- * @package Da\User\Factory
- * @modified 2017-10-18 by Kartik Visweswaran <kartikv2@gmail.com>
- */
 class MailFactory
 {
     /**
      * @param User $user
      * @param bool $showPassword
      *
+     * @throws InvalidConfigException
      * @return MailService
      */
     public static function makeWelcomeMailerService(User $user, $showPassword = false)
@@ -53,6 +49,7 @@ class MailFactory
      * @param string $email
      * @param Token  $token
      *
+     * @throws InvalidConfigException
      * @return MailService
      */
     public static function makeRecoveryMailerService($email, Token $token = null)
@@ -74,6 +71,7 @@ class MailFactory
      * @param User       $user
      * @param Token|null $token
      *
+     * @throws InvalidConfigException
      * @return MailService
      */
     public static function makeConfirmationMailerService(User $user, Token $token = null)
@@ -95,6 +93,7 @@ class MailFactory
      * @param User  $user
      * @param Token $token
      *
+     * @throws InvalidConfigException
      * @return MailService
      */
     public static function makeReconfirmationMailerService(User $user, Token $token)
@@ -112,7 +111,7 @@ class MailFactory
             'token' => $token,
         ];
 
-        return static::makeMailerService(MailEvent::TYPE_RECONFIRM, $from, $to, $subject, 'recovery', $params);
+        return static::makeMailerService(MailEvent::TYPE_RECONFIRM, $from, $to, $subject, 'reconfirmation', $params);
     }
 
     /**
@@ -125,7 +124,9 @@ class MailFactory
      * @param string $view
      * @param array  $params
      *
+     * @throws InvalidConfigException
      * @return MailService
+     *
      */
     public static function makeMailerService($type, $from, $to, $subject, $view, $params = [])
     {
diff --git a/src/User/Factory/TokenFactory.php b/src/User/Factory/TokenFactory.php
index 0e831a4..8f91e21 100644
--- a/src/User/Factory/TokenFactory.php
+++ b/src/User/Factory/TokenFactory.php
@@ -13,12 +13,14 @@ namespace Da\User\Factory;
 
 use Da\User\Model\Token;
 use Yii;
+use yii\base\InvalidConfigException;
 
 class TokenFactory
 {
     /**
      * @param $userId
      *
+     * @throws InvalidConfigException
      * @return Token
      */
     public static function makeConfirmationToken($userId)
@@ -47,6 +49,7 @@ class TokenFactory
     /**
      * @param $userId
      *
+     * @throws InvalidConfigException
      * @return Token
      */
     public static function makeConfirmOldMailToken($userId)
@@ -61,6 +64,7 @@ class TokenFactory
     /**
      * @param $userId
      *
+     * @throws InvalidConfigException
      * @return Token
      */
     public static function makeRecoveryToken($userId)
@@ -76,7 +80,8 @@ class TokenFactory
      * @param $userId
      * @param $type
      *
-     * @return Token
+     * @throws InvalidConfigException
+     * @return Token|\object
      */
     protected static function make($userId, $type)
     {
diff --git a/src/User/Filter/AccessRuleFilter.php b/src/User/Filter/AccessRuleFilter.php
index e0e2402..3f1c492 100644
--- a/src/User/Filter/AccessRuleFilter.php
+++ b/src/User/Filter/AccessRuleFilter.php
@@ -43,9 +43,10 @@ class AccessRuleFilter extends AccessRule
                     return true;
                 }
             } else {
-                if (!isset($roleParams)) {
-                    $roleParams = $this->roleParams instanceof Closure ? call_user_func($this->roleParams, $this) : $this->roleParams;
-                }
+                $roleParams = $this->roleParams instanceof Closure
+                    ? call_user_func($this->roleParams, $this)
+                    : $this->roleParams;
+
                 if ($user->can($role, $roleParams)) {
                     return true;
                 }
diff --git a/src/User/Form/LoginForm.php b/src/User/Form/LoginForm.php
index cd171eb..3327fba 100644
--- a/src/User/Form/LoginForm.php
+++ b/src/User/Form/LoginForm.php
@@ -11,12 +11,14 @@
 
 namespace Da\User\Form;
 
+use Da\TwoFA\Exception\InvalidSecretKeyException;
 use Da\User\Helper\SecurityHelper;
 use Da\User\Model\User;
 use Da\User\Query\UserQuery;
 use Da\User\Traits\ModuleAwareTrait;
 use Da\User\Validator\TwoFactorCodeValidator;
 use Yii;
+use yii\base\InvalidParamException;
 use yii\base\Model;
 
 class LoginForm extends Model
@@ -73,12 +75,14 @@ class LoginForm extends Model
             'login' => Yii::t('usuario', 'Login'),
             'password' => Yii::t('usuario', 'Password'),
             'rememberMe' => Yii::t('usuario', 'Remember me next time'),
-            'twoFactorAuthenticationCode' => Yii::t('usuario', 'Two-factor authentication code')
+            'twoFactorAuthenticationCode' => Yii::t('usuario', 'Two factor authentication code')
         ];
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @throws InvalidSecretKeyException
      */
     public function rules()
     {
@@ -111,7 +115,7 @@ class LoginForm extends Model
                             $this->module->twoFactorAuthenticationCycles
                         ))
                             ->validate()) {
-                        $this->addError($attribute, Yii::t('usuario', 'Invalid two-factor code'));
+                        $this->addError($attribute, Yii::t('usuario', 'Invalid two factor authentication code'));
                     }
                 }
             ],
@@ -137,6 +141,7 @@ class LoginForm extends Model
     /**
      * Validates form and logs the user in.
      *
+     * @throws InvalidParamException
      * @return bool whether the user is logged in successfully
      */
     public function login()
diff --git a/src/User/Form/RegistrationForm.php b/src/User/Form/RegistrationForm.php
index e45bbeb..09e0af2 100644
--- a/src/User/Form/RegistrationForm.php
+++ b/src/User/Form/RegistrationForm.php
@@ -37,6 +37,8 @@ class RegistrationForm extends Model
 
     /**
      * {@inheritdoc}
+     *
+     * @throws \Exception
      */
     public function rules()
     {
diff --git a/src/User/Form/SettingsForm.php b/src/User/Form/SettingsForm.php
index 25a9b3d..3366b34 100644
--- a/src/User/Form/SettingsForm.php
+++ b/src/User/Form/SettingsForm.php
@@ -17,7 +17,10 @@ use Da\User\Model\User;
 use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Traits\ModuleAwareTrait;
 use Yii;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
 use yii\base\Model;
+use yii\helpers\ArrayHelper;
 
 class SettingsForm extends Model
 {
@@ -48,18 +51,30 @@ class SettingsForm extends Model
     /** @var User */
     protected $user;
 
+    /**
+     * SettingsForm constructor.
+     *
+     * @param SecurityHelper $securityHelper
+     * @param array $config
+     */
     public function __construct(SecurityHelper $securityHelper, array $config = [])
     {
         $this->securityHelper = $securityHelper;
-        $config = [
-            'username' => $this->getUser()->username,
-            'email' => $this->getUser()->unconfirmed_email? : $this->getUser()->email
-        ];
+        $config = ArrayHelper::merge(
+            [
+                'username' => $this->getUser()->username,
+                'email' => $this->getUser()->unconfirmed_email ?: $this->getUser()->email
+            ],
+            $config
+        );
         parent::__construct($config);
     }
 
     /**
+     * @throws InvalidConfigException
+     * @throws InvalidParamException
      * @return array
+     *
      */
     public function rules()
     {
@@ -75,7 +90,7 @@ class SettingsForm extends Model
                 ['email', 'username'],
                 'unique',
                 'when' => function ($model, $attribute) {
-                    return $this->getUser()->$attribute != $model->$attribute;
+                    return $this->getUser()->$attribute !== $model->$attribute;
                 },
                 'targetClass' => $this->getClassMap()->get(User::class),
             ],
@@ -110,7 +125,7 @@ class SettingsForm extends Model
      */
     public function getUser()
     {
-        if ($this->user == null) {
+        if (null === $this->user) {
             $this->user = Yii::$app->user->identity;
         }
 
@@ -120,7 +135,9 @@ class SettingsForm extends Model
     /**
      * Saves new account settings.
      *
+     * @throws \Exception
      * @return bool
+     *
      */
     public function save()
     {
@@ -130,9 +147,9 @@ class SettingsForm extends Model
                 $user->scenario = 'settings';
                 $user->username = $this->username;
                 $user->password = $this->new_password;
-                if ($this->email == $user->email && $user->unconfirmed_email != null) {
+                if ($this->email === $user->email && $user->unconfirmed_email !== null) {
                     $user->unconfirmed_email = null;
-                } elseif ($this->email != $user->email) {
+                } elseif ($this->email !== $user->email) {
                     $strategy = EmailChangeStrategyFactory::makeByStrategyType(
                         $this->getModule()->emailChangeStrategy,
                         $this
diff --git a/src/User/Helper/AuthHelper.php b/src/User/Helper/AuthHelper.php
index 651e560..e85e191 100644
--- a/src/User/Helper/AuthHelper.php
+++ b/src/User/Helper/AuthHelper.php
@@ -56,7 +56,7 @@ class AuthHelper
             ? Yii::$app->getUser()->can($module->administratorPermissionName)
             : false;
 
-        return $hasAdministratorPermissionName || in_array($username, $module->administrators);
+        return $hasAdministratorPermissionName || in_array($username, $module->administrators, false);
     }
 
     /**
@@ -99,7 +99,7 @@ class AuthHelper
     public function getUnassignedItems(AbstractAuthItem $model)
     {
         $excludeItems = $model->item !== null ? [$model->item->name] : [];
-        $type = $model->getType() == Permission::TYPE_PERMISSION ? Permission::TYPE_PERMISSION : null;
+        $type = $model->getType() === Permission::TYPE_PERMISSION ? Permission::TYPE_PERMISSION : null;
         $items = $this->getAuthManager()->getItems($type, $excludeItems);
 
         return ArrayHelper::map(
diff --git a/src/User/Helper/ClassMapHelper.php b/src/User/Helper/ClassMapHelper.php
index fac9a3d..3ca99f8 100644
--- a/src/User/Helper/ClassMapHelper.php
+++ b/src/User/Helper/ClassMapHelper.php
@@ -11,14 +11,8 @@
 
 namespace Da\User\Helper;
 
-/**
- * ModelMapHelper.php.
- *
- * Date: 3/12/16
- * Time: 18:10
- *
- * @author Antonio Ramirez <hola@2amigos.us>
- */
+use yii\base\InvalidParamException;
+
 class ClassMapHelper
 {
     protected $map = [];
@@ -45,7 +39,7 @@ class ClassMapHelper
     /**
      * @param $key
      *
-     * @throws \Exception
+     * @throws InvalidParamException
      * @return mixed
      *
      */
@@ -54,6 +48,6 @@ class ClassMapHelper
         if (array_key_exists($key, $this->map)) {
             return $this->map[$key];
         }
-        throw new \Exception('Unknown model map key: ' . $key);
+        throw new InvalidParamException('Unknown model map key: ' . $key);
     }
 }
diff --git a/src/User/Helper/MigrationHelper.php b/src/User/Helper/MigrationHelper.php
index ed30648..7de2c41 100644
--- a/src/User/Helper/MigrationHelper.php
+++ b/src/User/Helper/MigrationHelper.php
@@ -18,7 +18,9 @@ class MigrationHelper
     /**
      * @param string $driverName
      *
+     * @throws RuntimeException
      * @return null|string
+     *
      */
     public static function resolveTableOptions($driverName)
     {
@@ -38,7 +40,9 @@ class MigrationHelper
     /**
      * @param $driverName
      *
+     * @throws RuntimeException
      * @return string
+     *
      */
     public static function resolveDbType($driverName)
     {
@@ -59,10 +63,12 @@ class MigrationHelper
     /**
      * @param string $driverName
      *
+     * @throws RuntimeException
      * @return bool
+     *
      */
     public static function isMicrosoftSQLServer($driverName)
     {
-        return self::resolveDbType($driverName) == 'sqlsrv';
+        return self::resolveDbType($driverName) === 'sqlsrv';
     }
 }
diff --git a/src/User/Helper/SecurityHelper.php b/src/User/Helper/SecurityHelper.php
index babff35..f540f0d 100644
--- a/src/User/Helper/SecurityHelper.php
+++ b/src/User/Helper/SecurityHelper.php
@@ -11,6 +11,7 @@
 
 namespace Da\User\Helper;
 
+use yii\base\Exception;
 use yii\base\Security;
 
 class SecurityHelper
@@ -31,13 +32,24 @@ class SecurityHelper
      * @param string   $password
      * @param null|int $cost
      *
+     * @throws Exception
      * @return string
+     *
      */
     public function generatePasswordHash($password, $cost = null)
     {
         return $this->security->generatePasswordHash($password, $cost);
     }
 
+    /**
+     * Generates a random string
+     *
+     * @param int $length
+     *
+     * @throws Exception
+     * @return string
+     *
+     */
     public function generateRandomString($length = 32)
     {
         return $this->security->generateRandomString($length);
diff --git a/src/User/Helper/TimezoneHelper.php b/src/User/Helper/TimezoneHelper.php
index 581b48f..aba5f17 100644
--- a/src/User/Helper/TimezoneHelper.php
+++ b/src/User/Helper/TimezoneHelper.php
@@ -13,6 +13,7 @@ namespace Da\User\Helper;
 
 use DateTime;
 use DateTimeZone;
+use yii\base\InvalidParamException;
 use yii\helpers\ArrayHelper;
 
 class TimezoneHelper
@@ -20,7 +21,9 @@ class TimezoneHelper
     /**
      * Get all of the time zones with the offsets sorted by their offset.
      *
+     * @throws InvalidParamException
      * @return array
+     *
      */
     public static function getAll()
     {
diff --git a/src/User/Migration/m000000_000006_add_two_factor_fields.php b/src/User/Migration/m000000_000006_add_two_factor_fields.php
index 2da4dc7..b9ec7ed 100644
--- a/src/User/Migration/m000000_000006_add_two_factor_fields.php
+++ b/src/User/Migration/m000000_000006_add_two_factor_fields.php
@@ -18,7 +18,7 @@ class m000000_000006_add_two_factor_fields extends Migration
     public function safeUp()
     {
         $this->addColumn('{{%user}}', 'auth_tf_key', $this->string(16));
-        $this->addColumn('{{%user}}', 'auth_tf_enabled', $this->boolean()->defaultValue(0));
+        $this->addColumn('{{%user}}', 'auth_tf_enabled', $this->boolean()->defaultValue(false));
     }
 
     public function safeDown()
diff --git a/src/User/Model/AbstractAuthItem.php b/src/User/Model/AbstractAuthItem.php
index dbee40b..9080582 100644
--- a/src/User/Model/AbstractAuthItem.php
+++ b/src/User/Model/AbstractAuthItem.php
@@ -108,7 +108,7 @@ abstract class AbstractAuthItem extends Model
                     }
                 },
                 'when' => function () {
-                    return $this->scenario == 'create' || $this->item->name != $this->name;
+                    return $this->scenario === 'create' || $this->item->name !== $this->name;
                 },
             ],
             ['children', RbacItemsValidator::class],
diff --git a/src/User/Model/Profile.php b/src/User/Model/Profile.php
index 450c878..72c1450 100644
--- a/src/User/Model/Profile.php
+++ b/src/User/Model/Profile.php
@@ -20,6 +20,8 @@ use DateTime;
 use DateTimeZone;
 use Exception;
 use Yii;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
 use yii\db\ActiveRecord;
 
 /**
@@ -41,6 +43,9 @@ class Profile extends ActiveRecord
 
     /**
      * {@inheritdoc}
+     *
+     * @throws InvalidParamException
+     * @throws InvalidConfigException
      */
     public function beforeSave($insert)
     {
@@ -64,6 +69,8 @@ class Profile extends ActiveRecord
 
     /**
      * {@inheritdoc}
+     *
+     * @throws InvalidConfigException
      */
     public function rules()
     {
@@ -122,6 +129,8 @@ class Profile extends ActiveRecord
      * Set the User's timezone.
      *
      * @param DateTimeZone $timezone
+     *
+     * @throws InvalidParamException
      */
     public function setTimeZone(DateTimeZone $timezone)
     {
@@ -141,6 +150,7 @@ class Profile extends ActiveRecord
     }
 
     /**
+     * @throws InvalidConfigException
      * @return \yii\db\ActiveQuery
      */
     public function getUser()
@@ -151,6 +161,7 @@ class Profile extends ActiveRecord
     /**
      * @param int $size
      *
+     * @throws InvalidConfigException
      * @return mixed
      */
     public function getAvatarUrl($size = 200)
diff --git a/src/User/Model/SocialNetworkAccount.php b/src/User/Model/SocialNetworkAccount.php
index c325a50..a064103 100644
--- a/src/User/Model/SocialNetworkAccount.php
+++ b/src/User/Model/SocialNetworkAccount.php
@@ -15,6 +15,8 @@ use Da\User\Query\SocialNetworkAccountQuery;
 use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Traits\ModuleAwareTrait;
 use Yii;
+use yii\base\Exception;
+use yii\base\InvalidParamException;
 use yii\db\ActiveRecord;
 use yii\helpers\Url;
 
@@ -55,7 +57,7 @@ class SocialNetworkAccount extends ActiveRecord
      */
     public function getIsConnected()
     {
-        return $this->user_id != null;
+        return null !== $this->user_id;
     }
 
     /**
@@ -71,6 +73,8 @@ class SocialNetworkAccount extends ActiveRecord
     }
 
     /**
+     * @throws Exception
+     * @throws InvalidParamException
      * @return string the connection url
      */
     public function getConnectionUrl()
diff --git a/src/User/Model/Token.php b/src/User/Model/Token.php
index 69651ab..27d441c 100644
--- a/src/User/Model/Token.php
+++ b/src/User/Model/Token.php
@@ -16,6 +16,8 @@ use Da\User\Query\TokenQuery;
 use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Traits\ModuleAwareTrait;
 use RuntimeException;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
 use yii\db\ActiveRecord;
 use yii\helpers\Url;
 
@@ -49,6 +51,9 @@ class Token extends ActiveRecord
 
     /**
      * {@inheritdoc}
+     *
+     * @throws InvalidParamException
+     * @throws InvalidConfigException
      */
     public function beforeSave($insert)
     {
@@ -86,6 +91,7 @@ class Token extends ActiveRecord
     }
 
     /**
+     * @throws InvalidParamException
      * @return string
      */
     public function getUrl()
@@ -94,16 +100,17 @@ class Token extends ActiveRecord
     }
 
     /**
+     * @throws RuntimeException
      * @return bool Whether token has expired
      */
     public function getIsExpired()
     {
-        if ($this->type == static::TYPE_RECOVERY) {
+        if ($this->type === static::TYPE_RECOVERY) {
             $expirationTime = $this->getModule()->tokenRecoveryLifespan;
         } elseif ($this->type >= static::TYPE_CONFIRMATION && $this->type <= static::TYPE_CONFIRM_OLD_EMAIL) {
             $expirationTime = $this->getModule()->tokenConfirmationLifespan;
         } else {
-            throw new RuntimeException();
+            throw new RuntimeException('Unknown Token type.');
         }
 
         return ($this->created_at + $expirationTime) < time();
diff --git a/src/User/Model/User.php b/src/User/Model/User.php
index b85147c..b765171 100644
--- a/src/User/Model/User.php
+++ b/src/User/Model/User.php
@@ -16,6 +16,9 @@ use Da\User\Query\UserQuery;
 use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Traits\ModuleAwareTrait;
 use Yii;
+use yii\base\Exception;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
 use yii\base\NotSupportedException;
 use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveRecord;
@@ -74,6 +77,10 @@ class User extends ActiveRecord implements IdentityInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @throws InvalidParamException
+     * @throws InvalidConfigException
+     * @throws Exception
      */
     public function beforeSave($insert)
     {
@@ -99,6 +106,8 @@ class User extends ActiveRecord implements IdentityInterface
 
     /**
      * @inheritdoc
+     *
+     * @throws InvalidConfigException
      */
     public function afterSave($insert, $changedAttributes)
     {
@@ -245,6 +254,7 @@ class User extends ActiveRecord implements IdentityInterface
     }
 
     /**
+     * @throws InvalidConfigException
      * @return bool whether the user is an admin or not
      */
     public function getIsAdmin()
@@ -274,6 +284,8 @@ class User extends ActiveRecord implements IdentityInterface
     }
 
     /**
+     * @throws InvalidConfigException
+     * @throws InvalidParamException
      * @return \yii\db\ActiveQuery
      */
     public function getProfile()
@@ -282,11 +294,13 @@ class User extends ActiveRecord implements IdentityInterface
     }
 
     /**
+     * @throws \Exception
      * @return SocialNetworkAccount[] social connected accounts [ 'providerName' => socialAccountModel ]
+     *
      */
     public function getSocialNetworkAccounts()
     {
-        if ($this->connectedAccounts == null) {
+        if (null === $this->connectedAccounts) {
             /** @var SocialNetworkAccount[] $accounts */
             $accounts = $this->hasMany(
                 $this->getClassMap()
@@ -313,6 +327,8 @@ class User extends ActiveRecord implements IdentityInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @throws NotSupportedException
      */
     public static function findIdentityByAccessToken($token, $type = null)
     {
diff --git a/src/User/Query/SocialNetworkAccountQuery.php b/src/User/Query/SocialNetworkAccountQuery.php
index 8ca2843..eee6d34 100644
--- a/src/User/Query/SocialNetworkAccountQuery.php
+++ b/src/User/Query/SocialNetworkAccountQuery.php
@@ -26,7 +26,7 @@ class SocialNetworkAccountQuery extends ActiveQuery
         return $this->andWhere(
             [
                 'provider' => $client->getId(),
-                'client_id' => $client->getUserAttributes()['id'],
+                'client_id' => (string)$client->getUserAttributes()['id'],
             ]
         );
     }
diff --git a/src/User/Search/RuleSearch.php b/src/User/Search/RuleSearch.php
index af460e3..96270cf 100644
--- a/src/User/Search/RuleSearch.php
+++ b/src/User/Search/RuleSearch.php
@@ -13,6 +13,8 @@ namespace Da\User\Search;
 
 use Da\User\Model\Rule;
 use Da\User\Traits\ContainerAwareTrait;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use yii\db\Query;
@@ -47,6 +49,8 @@ class RuleSearch extends Rule
     /**
      * @param array $params
      *
+     * @throws InvalidConfigException
+     * @throws InvalidParamException
      * @return ActiveDataProvider
      */
     public function search(array $params = [])
diff --git a/src/User/Search/UserSearch.php b/src/User/Search/UserSearch.php
index a604c2f..17653e3 100644
--- a/src/User/Search/UserSearch.php
+++ b/src/User/Search/UserSearch.php
@@ -13,6 +13,7 @@ namespace Da\User\Search;
 
 use Da\User\Query\UserQuery;
 use Yii;
+use yii\base\InvalidParamException;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 
@@ -83,6 +84,7 @@ class UserSearch extends Model
     /**
      * @param $params
      *
+     * @throws InvalidParamException
      * @return ActiveDataProvider
      */
     public function search($params)
diff --git a/src/User/Service/AuthRuleEditionService.php b/src/User/Service/AuthRuleEditionService.php
index 8ff4254..55983d7 100644
--- a/src/User/Service/AuthRuleEditionService.php
+++ b/src/User/Service/AuthRuleEditionService.php
@@ -31,14 +31,14 @@ class AuthRuleEditionService implements ServiceInterface
 
     public function run()
     {
-        if (!$this->model->validate() || (!in_array($this->model->scenario, ['create', 'update']))) {
+        if (!$this->model->validate() || (!in_array($this->model->scenario, ['create', 'update'], false))) {
             return false;
         }
 
         $rule = $this->make($this->model->className, [], ['name' => $this->model->name]);
 
         try {
-            if ($this->model->scenario == 'create') {
+            if ($this->model->scenario === 'create') {
                 $this->getAuthManager()->add($rule);
             } else {
                 $this->getAuthManager()->update($this->model->previousName, $rule);
diff --git a/src/User/Service/EmailChangeService.php b/src/User/Service/EmailChangeService.php
index 88d568c..3400846 100644
--- a/src/User/Service/EmailChangeService.php
+++ b/src/User/Service/EmailChangeService.php
@@ -76,8 +76,8 @@ class EmailChangeService implements ServiceInterface
                     );
                 }
             }
-            if ($this->getModule()->emailChangeStrategy === MailChangeStrategyInterface::TYPE_DEFAULT
-                || ($this->model->flags & User::NEW_EMAIL_CONFIRMED & $this->model->flags & User::OLD_EMAIL_CONFIRMED)
+            if (($this->model->flags & User::NEW_EMAIL_CONFIRMED & $this->model->flags & User::OLD_EMAIL_CONFIRMED)
+                || $this->getModule()->emailChangeStrategy === MailChangeStrategyInterface::TYPE_DEFAULT
             ) {
                 $this->model->email = $this->model->unconfirmed_email;
                 $this->model->unconfirmed_email = null;
diff --git a/src/User/Service/MailService.php b/src/User/Service/MailService.php
index 81e9b9c..a0dfd0d 100644
--- a/src/User/Service/MailService.php
+++ b/src/User/Service/MailService.php
@@ -31,13 +31,13 @@ class MailService implements ServiceInterface
     /**
      * MailService constructor.
      *
-     * @param string                     $type      the mailer type
-     * @param string                     $from      from email account
-     * @param string                     $to        to email account
-     * @param string                     $subject   the email subject
-     * @param string                     $view      the view to render mail
-     * @param array                      $params    view parameters
-     * @param BaseMailer|MailerInterface $mailer    mailer interface
+     * @param string                     $type    the mailer type
+     * @param string                     $from    from email account
+     * @param string                     $to      to email account
+     * @param string                     $subject the email subject
+     * @param string                     $view    the view to render mail
+     * @param array                      $params  view parameters
+     * @param BaseMailer|MailerInterface $mailer  mailer interface
      */
     public function __construct($type, $from, $to, $subject, $view, array $params, MailerInterface $mailer)
     {
diff --git a/src/User/Service/PasswordRecoveryService.php b/src/User/Service/PasswordRecoveryService.php
index 08e7239..5f319b0 100644
--- a/src/User/Service/PasswordRecoveryService.php
+++ b/src/User/Service/PasswordRecoveryService.php
@@ -13,13 +13,11 @@ namespace Da\User\Service;
 
 use Da\User\Contracts\ServiceInterface;
 use Da\User\Factory\TokenFactory;
-use Da\User\Model\Token;
 use Da\User\Model\User;
 use Da\User\Query\UserQuery;
 use Da\User\Traits\MailAwareTrait;
 use Exception;
 use Yii;
-use yii\log\Logger;
 
 class PasswordRecoveryService implements ServiceInterface
 {
@@ -30,14 +28,12 @@ class PasswordRecoveryService implements ServiceInterface
     protected $email;
     protected $mailService;
     protected $securityHelper;
-    protected $logger;
 
-    public function __construct($email, MailService $mailService, UserQuery $query, Logger $logger)
+    public function __construct($email, MailService $mailService, UserQuery $query)
     {
         $this->email = $email;
         $this->mailService = $mailService;
         $this->query = $query;
-        $this->logger = $logger;
     }
 
     public function run()
@@ -46,6 +42,10 @@ class PasswordRecoveryService implements ServiceInterface
             /** @var User $user */
             $user = $this->query->whereEmail($this->email)->one();
 
+            if ($user === null) {
+                throw new \RuntimeException('User not found.');
+            }
+
             $token = TokenFactory::makeRecoveryToken($user->id);
 
             if (!$token) {
@@ -65,7 +65,7 @@ class PasswordRecoveryService implements ServiceInterface
 
             return true;
         } catch (Exception $e) {
-            $this->logger->log($e->getMessage(), Logger::LEVEL_ERROR);
+            Yii::error($e->getMessage(), 'usuario');
 
             return false;
         }
diff --git a/src/User/Service/ResendConfirmationService.php b/src/User/Service/ResendConfirmationService.php
index e70618a..7c131d9 100644
--- a/src/User/Service/ResendConfirmationService.php
+++ b/src/User/Service/ResendConfirmationService.php
@@ -15,7 +15,6 @@ use Da\User\Contracts\ServiceInterface;
 use Da\User\Factory\TokenFactory;
 use Da\User\Model\User;
 use Da\User\Traits\MailAwareTrait;
-use yii\log\Logger;
 
 class ResendConfirmationService implements ServiceInterface
 {
@@ -23,13 +22,11 @@ class ResendConfirmationService implements ServiceInterface
 
     protected $model;
     protected $mailService;
-    protected $logger;
 
-    public function __construct(User $model, MailService $mailService, Logger $logger)
+    public function __construct(User $model, MailService $mailService)
     {
         $this->model = $model;
         $this->mailService = $mailService;
-        $this->logger = $logger;
     }
 
     public function run()
@@ -37,6 +34,7 @@ class ResendConfirmationService implements ServiceInterface
         if ($this->model && !$this->model->getIsConfirmed()) {
             $token = TokenFactory::makeConfirmationToken($this->model->id);
             $this->mailService->setViewParam('token', $token);
+
             return $this->sendMail($this->model);
         }
 
diff --git a/src/User/Service/TwoFactorQrCodeUriGeneratorService.php b/src/User/Service/TwoFactorQrCodeUriGeneratorService.php
index e407b66..0492bdc 100644
--- a/src/User/Service/TwoFactorQrCodeUriGeneratorService.php
+++ b/src/User/Service/TwoFactorQrCodeUriGeneratorService.php
@@ -47,8 +47,7 @@ class TwoFactorQrCodeUriGeneratorService implements ServiceInterface
         }
 
         $totpUri = (new TOTPSecretKeyUriGeneratorService(Yii::$app->name, $user->email, $user->auth_tf_key))->run();
-        $dataUri = (new QrCodeDataUriGeneratorService($totpUri))->run();
 
-        return $dataUri;
+        return (new QrCodeDataUriGeneratorService($totpUri))->run();
     }
 }
diff --git a/src/User/Service/UserCreateService.php b/src/User/Service/UserCreateService.php
index 9769362..2463ef2 100644
--- a/src/User/Service/UserCreateService.php
+++ b/src/User/Service/UserCreateService.php
@@ -19,7 +19,6 @@ use Da\User\Traits\MailAwareTrait;
 use Exception;
 use Yii;
 use yii\base\InvalidCallException;
-use yii\log\Logger;
 
 class UserCreateService implements ServiceInterface
 {
@@ -28,18 +27,19 @@ class UserCreateService implements ServiceInterface
     protected $model;
     protected $securityHelper;
     protected $mailService;
-    protected $logger;
 
-    public function __construct(User $model, MailService $mailService, SecurityHelper $securityHelper, Logger $logger)
+    public function __construct(User $model, MailService $mailService, SecurityHelper $securityHelper)
     {
         $this->model = $model;
         $this->mailService = $mailService;
         $this->securityHelper = $securityHelper;
-        $this->logger = $logger;
     }
 
     /**
+     * @throws InvalidCallException
+     * @throws \yii\db\Exception
      * @return bool
+     *
      */
     public function run()
     {
@@ -49,7 +49,7 @@ class UserCreateService implements ServiceInterface
             throw new InvalidCallException('Cannot create a new user from an existing one.');
         }
 
-        $transaction = $model->getDb()->beginTransaction();
+        $transaction = $model::getDb()->beginTransaction();
 
         try {
             $model->confirmed_at = time();
@@ -81,7 +81,7 @@ class UserCreateService implements ServiceInterface
             return true;
         } catch (Exception $e) {
             $transaction->rollBack();
-            $this->logger->log($e->getMessage(), Logger::LEVEL_ERROR);
+            Yii::error($e->getMessage(), 'usuario');
 
             return false;
         }
diff --git a/src/User/Service/UserRegisterService.php b/src/User/Service/UserRegisterService.php
index b14d4a2..eb15983 100644
--- a/src/User/Service/UserRegisterService.php
+++ b/src/User/Service/UserRegisterService.php
@@ -19,9 +19,8 @@ use Da\User\Model\User;
 use Da\User\Traits\MailAwareTrait;
 use Da\User\Traits\ModuleAwareTrait;
 use Exception;
-use yii\base\InvalidCallException;
-use yii\log\Logger;
 use Yii;
+use yii\base\InvalidCallException;
 
 class UserRegisterService implements ServiceInterface
 {
@@ -31,14 +30,12 @@ class UserRegisterService implements ServiceInterface
     protected $model;
     protected $securityHelper;
     protected $mailService;
-    protected $logger;
 
-    public function __construct(User $model, MailService $mailService, SecurityHelper $securityHelper, Logger $logger)
+    public function __construct(User $model, MailService $mailService, SecurityHelper $securityHelper)
     {
         $this->model = $model;
         $this->mailService = $mailService;
         $this->securityHelper = $securityHelper;
-        $this->logger = $logger;
     }
 
     public function run()
@@ -49,7 +46,7 @@ class UserRegisterService implements ServiceInterface
             throw new InvalidCallException('Cannot register user from an existing one.');
         }
 
-        $transaction = $model->getDb()->beginTransaction();
+        $transaction = $model::getDb()->beginTransaction();
 
         try {
             $model->confirmed_at = $this->getModule()->enableEmailConfirmation ? null : time();
@@ -91,7 +88,7 @@ class UserRegisterService implements ServiceInterface
             return true;
         } catch (Exception $e) {
             $transaction->rollBack();
-            $this->logger->log($e->getMessage(), Logger::LEVEL_ERROR);
+            Yii::error($e->getMessage(), 'usuario');
 
             return false;
         }
diff --git a/src/User/Traits/ContainerAwareTrait.php b/src/User/Traits/ContainerAwareTrait.php
index 8bac337..67baa3f 100644
--- a/src/User/Traits/ContainerAwareTrait.php
+++ b/src/User/Traits/ContainerAwareTrait.php
@@ -14,6 +14,7 @@ namespace Da\User\Traits;
 use Da\User\Helper\AuthHelper;
 use Da\User\Helper\ClassMapHelper;
 use Yii;
+use yii\base\InvalidConfigException;
 use yii\di\Container;
 
 /**
@@ -39,6 +40,7 @@ trait ContainerAwareTrait
      * @param array  $params constructor parameters
      * @param array  $config attributes
      *
+     * @throws InvalidConfigException
      * @return object
      */
     public function make($class, $params = [], $config = [])
@@ -47,7 +49,9 @@ trait ContainerAwareTrait
     }
 
     /**
+     * @throws InvalidConfigException
      * @return \Da\User\Helper\AuthHelper|object
+     *
      */
     public function getAuth()
     {
@@ -55,7 +59,9 @@ trait ContainerAwareTrait
     }
 
     /**
+     * @throws InvalidConfigException
      * @return \Da\User\Helper\ClassMapHelper|object
+     *
      */
     public function getClassMap()
     {
diff --git a/src/User/Traits/MailAwareTrait.php b/src/User/Traits/MailAwareTrait.php
index 38d3693..a823c48 100644
--- a/src/User/Traits/MailAwareTrait.php
+++ b/src/User/Traits/MailAwareTrait.php
@@ -15,12 +15,11 @@ use Da\User\Event\MailEvent;
 use Da\User\Model\User;
 use Da\User\Service\MailService;
 use Exception;
-use yii\log\Logger;
+use Yii;
+use yii\base\InvalidConfigException;
 
 /**
  * @property MailService $mailService
- * @property Logger $logger
- * @author Kartik Visweswaran <kartikv2@gmail.com>
  */
 trait MailAwareTrait
 {
@@ -31,6 +30,7 @@ trait MailAwareTrait
      *
      * @param User $user
      *
+     * @throws InvalidConfigException
      * @return bool
      */
     protected function sendMail(User $user)
@@ -42,7 +42,7 @@ trait MailAwareTrait
             $this->mailService->run();
         } catch (Exception $e) {
             $event = $this->make(MailEvent::class, [$type, $user, $this->mailService, $e]);
-            $this->logger->log($e->getMessage(), Logger::LEVEL_ERROR);
+            Yii::error($e->getMessage(), 'usuario');
             $user->trigger(MailEvent::EVENT_AFTER_SEND_MAIL, $event);
             return false;
         }
diff --git a/src/User/Validator/RbacItemsValidator.php b/src/User/Validator/RbacItemsValidator.php
index 60261ca..45d06c2 100644
--- a/src/User/Validator/RbacItemsValidator.php
+++ b/src/User/Validator/RbacItemsValidator.php
@@ -26,7 +26,7 @@ class RbacItemsValidator extends Validator
         }
 
         foreach ($value as $item) {
-            if ($this->getAuthManager()->getItem($item) == null) {
+            if ($this->getAuthManager()->getItem($item) === null) {
                 return [Yii::t('usuario', 'There is neither role nor permission with name "{0}"', [$item]), []];
             }
         }
diff --git a/src/User/Validator/RbacRuleNameValidator.php b/src/User/Validator/RbacRuleNameValidator.php
index 0089f82..edb5f9f 100644
--- a/src/User/Validator/RbacRuleNameValidator.php
+++ b/src/User/Validator/RbacRuleNameValidator.php
@@ -30,7 +30,7 @@ class RbacRuleNameValidator extends Validator
      */
     protected function validateValue($value)
     {
-        if ($this->previousName != $value) {
+        if ($this->previousName !== $value) {
             $rule = $this->getAuthManager()->getRule($value);
 
             if ($rule instanceof Rule) {
diff --git a/src/User/Validator/ReCaptchaValidator.php b/src/User/Validator/ReCaptchaValidator.php
index 56f646f..79f6d2e 100644
--- a/src/User/Validator/ReCaptchaValidator.php
+++ b/src/User/Validator/ReCaptchaValidator.php
@@ -13,6 +13,7 @@ namespace Da\User\Validator;
 
 use Da\User\Component\ReCaptchaComponent;
 use Yii;
+use yii\base\InvalidConfigException;
 use yii\validators\Validator;
 
 class ReCaptchaValidator extends Validator
@@ -52,6 +53,8 @@ class ReCaptchaValidator extends Validator
 
     /**
      * @inheritdoc
+     *
+     * @throws InvalidConfigException
      */
     protected function validateValue($value)
     {
diff --git a/src/User/Validator/TimeZoneValidator.php b/src/User/Validator/TimeZoneValidator.php
index 6f91641..387ac83 100644
--- a/src/User/Validator/TimeZoneValidator.php
+++ b/src/User/Validator/TimeZoneValidator.php
@@ -24,6 +24,6 @@ class TimeZoneValidator implements ValidatorInterface
 
     public function validate()
     {
-        return in_array($this->timezone, timezone_identifiers_list());
+        return in_array($this->timezone, timezone_identifiers_list(), false);
     }
 }
diff --git a/src/User/Validator/TwoFactorCodeValidator.php b/src/User/Validator/TwoFactorCodeValidator.php
index fe9822d..9308390 100644
--- a/src/User/Validator/TwoFactorCodeValidator.php
+++ b/src/User/Validator/TwoFactorCodeValidator.php
@@ -11,6 +11,7 @@
 
 namespace Da\User\Validator;
 
+use Da\TwoFA\Exception\InvalidSecretKeyException;
 use Da\TwoFA\Manager;
 use Da\User\Contracts\ValidatorInterface;
 use Da\User\Model\User;
@@ -36,7 +37,9 @@ class TwoFactorCodeValidator implements ValidatorInterface
     }
 
     /**
+     * @throws InvalidSecretKeyException
      * @return bool|int
+     *
      */
     public function validate()
     {
diff --git a/src/User/Widget/AssignmentsWidget.php b/src/User/Widget/AssignmentsWidget.php
index 646ae81..1ef18fc 100644
--- a/src/User/Widget/AssignmentsWidget.php
+++ b/src/User/Widget/AssignmentsWidget.php
@@ -16,6 +16,7 @@ use Da\User\Service\UpdateAuthAssignmentsService;
 use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Traits\ContainerAwareTrait;
 use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
 use yii\base\Widget;
 use yii\helpers\ArrayHelper;
 
@@ -48,6 +49,9 @@ class AssignmentsWidget extends Widget
 
     /**
      * {@inheritdoc}
+     *
+     * @throws InvalidParamException
+     * @throws InvalidConfigException
      */
     public function run()
     {
diff --git a/src/User/Widget/ConnectWidget.php b/src/User/Widget/ConnectWidget.php
index 3910c48..03f1784 100644
--- a/src/User/Widget/ConnectWidget.php
+++ b/src/User/Widget/ConnectWidget.php
@@ -15,6 +15,7 @@ use Yii;
 use yii\authclient\ClientInterface;
 use yii\authclient\widgets\AuthChoice;
 use yii\authclient\widgets\AuthChoiceAsset;
+use yii\base\InvalidParamException;
 use yii\helpers\Html;
 use yii\helpers\Url;
 
@@ -40,6 +41,8 @@ class ConnectWidget extends AuthChoice
 
     /**
      * {@inheritdoc}
+     *
+     * @throws InvalidParamException
      */
     public function createClientUrl($provider)
     {
@@ -59,6 +62,6 @@ class ConnectWidget extends AuthChoice
      */
     public function isConnected(ClientInterface $provider)
     {
-        return $this->accounts != null && isset($this->accounts[$provider->getId()]);
+        return null !== $this->accounts && isset($this->accounts[$provider->getId()]);
     }
 }
diff --git a/src/User/Widget/ReCaptchaWidget.php b/src/User/Widget/ReCaptchaWidget.php
index 7f8883a..aa7e8d6 100644
--- a/src/User/Widget/ReCaptchaWidget.php
+++ b/src/User/Widget/ReCaptchaWidget.php
@@ -49,6 +49,8 @@ class ReCaptchaWidget extends InputWidget
 
     /**
      * @inheritdoc
+     *
+     * @throws InvalidConfigException
      */
     public function init()
     {
@@ -63,6 +65,8 @@ class ReCaptchaWidget extends InputWidget
 
     /**
      * @inheritdoc
+     *
+     * @throws InvalidConfigException
      */
     public function run()
     {
@@ -78,6 +82,7 @@ class ReCaptchaWidget extends InputWidget
     }
 
     /**
+     * @throws InvalidConfigException
      * @return array the google recaptcha options.
      */
     protected function getCaptchaOptions()
@@ -156,7 +161,7 @@ class ReCaptchaWidget extends InputWidget
             'pt-PT'
         ];
 
-        return in_array($language, $except)
+        return in_array($language, $except, false)
             ? $language
             : substr($language, 0, strpos($language, '-'));
     }
diff --git a/src/User/resources/i18n/ca/usuario.php b/src/User/resources/i18n/ca/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/ca/usuario.php
+++ b/src/User/resources/i18n/ca/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/da/usuario.php b/src/User/resources/i18n/da/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/da/usuario.php
+++ b/src/User/resources/i18n/da/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/de-DU/usuario.php b/src/User/resources/i18n/de-DU/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/de-DU/usuario.php
+++ b/src/User/resources/i18n/de-DU/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/de/usuario.php b/src/User/resources/i18n/de/usuario.php
index a719215..32b2b8d 100644
--- a/src/User/resources/i18n/de/usuario.php
+++ b/src/User/resources/i18n/de/usuario.php
@@ -17,75 +17,39 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Eine Nachricht wurde an Ihre E-Mail-Adresse gesendet. Sie enthält einen Bestätigungslink den Sie klicken müssen um die Registrierung abzuschließen.',
-    'Are you sure you want to switch to this user for the rest of this Session?' => 'Sind Sie sicher, dass Sie zu diesem Benutzer zu wechseln möchten für den Rest dieser Session?',
-    'Are you sure you wish to send a password recovery email to this user?' => 'Sind Sie sicher, dass Sie eine Passwortwiederherstellungs-Mail an diesen Benutzer senden möchten?',
-    'Authentication rule class {0} can not be instantiated' => 'Von der Authentifizierungsregel Klasse {0} kann keine Instanz erstellt werden',
-    'Authorization rule has been added.' => 'Berechtigungsregel wurde hinzugefügt.',
-    'Authorization rule has been removed.' => 'Berechtigungsregel wurde entfernt.',
-    'Authorization rule has been updated.' => 'Berechtigungsregel wurde gespeichert.',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Fast geschafft. Nun müssen Sie nur noch den Aktivierungslink besuchen, der an ihre neue E-Mail Adresse gesendet wurde.',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Fast geschafft. Nun müssen Sie nur noch den Aktivierungslink besuchen, der an ihre alte E-Mail Adresse gesendet wurde.',
-    'Cancel' => 'Abbrechen',
-    'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'Kann die Rolle "{0}" nicht zuordnen da der AuthManager in der Console Application nicht konfiguriert ist.',
-    'Class' => 'Klasse',
-    'Close' => 'schließen',
-    'Create new rule' => 'Neue Regel erstellen',
-    'Created at' => 'Erstellt am',
-    'Disable Two-Factor Auth' => 'Zweifaktor-Authentifizierung deaktivieren',
-    'Enable' => 'aktivieren',
-    'Enable Two-factor auth' => 'Zweifaktor-Authentifizierung aktivieren',
-    'Error sending registration message to "{email}". Please try again later.' => 'Fehler beim Senden der Registrierungsnachricht an "{email}". Bitte später noch einmal probieren.',
-    'Error sending welcome message to "{email}". Please try again later.' => 'Fehler beim Senden der Willkommensnachricht an "{email}". Bitte später noch einmal probieren.',   
-    'Impersonate this user' => 'Wechsle zu diesem Benutzer',
-    'Invalid two-factor code' => 'Ungültiger Zweifaktor Schlüssel',
-    'Last login' => 'Letzter Login',
-    'Never' => 'Nie',
-    'New rule' => 'Neue Regel',
-    'Required "key" cannot be empty.' => 'Erforderlicher "key" darf nicht leer sein.',
-    'Required "secret" cannot be empty.' => 'Erforderliches "secret" darf nicht leer sein.',
-    'Role "{0}" not found. Creating it.' => 'Rolle "{0}" nicht gefunden. Erstelle diese.',
-    'Rule class must extend "yii\\rbac\\Rule".' => 'Regelklasse muss "yii\\rbac\\Rule" erweitern.',
-    'Rule name {0} is already in use' => 'Regelname {0} bereits in Benutzung',
-    'Rule {0} does not exists' => 'Regel {0} existiert nicht',
-    'Rule {0} not found.' => 'Regel {0} nicht gefunden.',
-    'Rules' => 'Regeln',
-    'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Scanne den Qr-Code mit der Google Authenticator App, dann füge den temporären Schlüssel in das Feld und sende es ab.',
-    'Send password recovery email' => 'Sende Mail zur Passwortwiederherstellung',
-    'Switch identities is disabled.' => 'Identitäten wechseln ist deaktiviert.',
-    'The "recaptcha" component must be configured.' => 'Die "recaptcha" Komponente muss konfiguriert werden.',
-    'The verification code is incorrect.' => 'Der Verifizierungsschlüssel ist ungültig.',
-    'This will disable two-factor auth. Are you sure?' => 'Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?',
-    'Two Factor Authentication' => 'Zweifaktor-Authentifizierung',
-    'Two factor successfully enabled.' => 'Zweifaktor-Authentifizierung erfolgreich aktiviert.',
-    'Two-Factor Authentication' => 'Zweifaktor-Authentifizierung',
-    'Two-factor auth protects you against stolen credentials' => 'Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten',
-    'Two-factor authentication code' => 'Zweifaktor-Authentifizierungsschlüssel',
-    'Two-factor authorization has been disabled.' => 'Zweifaktor-Authentifizierung wurde deaktiviert.',
-    'Two-factor code' => 'Zweifaktor-Schlüssel',
-    'Unable to create new authorization rule.' => 'Unfähig eine neue Authentifizierungsregel zu erstellen.',
-    'Unable to disable two-factor authorization.' => 'Unfähig die Zweifaktor-Authentifizierung zu deaktivieren.',
-    'Unable to send recovery message to the user' => 'Unfähig die Wiederherstellungsnachricht an den Benutzer zu senden.',
-    'Unable to update authorization rule.' => 'Unfähig die Berechtigungsregel zu speichern.',
-    'Update rule' => 'Regel aktualisieren',
-    'Updated at' => 'Aktualisiert am',
-    'User account could not be created.' => 'Benutzerkonto konnte nicht erstellt werden.',
-    'User could not be registered.' => 'Benutzer konnte nicht registriert werden.',
-    'User not found.' => 'Benutzer nicht gefunden.',
-    'Verification failed. Please, enter new code.' => 'Verifizierung fehlgeschlagen. Bitte einen neuen Schlüssel eingeben.',
-    'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Wir konnten die Mail zur Bestätigung Ihrer Adresse nicht noch einmal senden. Bitte kontrollieren Sie ob die E-Mail-Adresse korrekt ist oder diese bereits bestätigt wurde.',
-    'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Wir haben Ihnen Bestätigungslinks an die alte und neue E-Mail-Adresse geschickt. Sie müssen beide Links anklicken um die Anfrage fertigzustellen.',
-    '{0} cannot be blank.' => '{0} darf nicht leer sein.',
+    'Disable two factor authentication' => '',
+    'Enable two factor authentication' => '',
+    'Invalid two factor authentication code' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'A message has been sent to your email address. ' => '@@Eine Nachricht wurde an ihre E-Mail Adresse versandt@@',
     'Awesome, almost there. ' => '@@Fast geschafft. @@',
     'Class "{0}" does not exist' => '@@Klasse "{0}" existiert nicht@@',
+    'Disable Two-Factor Auth' => '@@Zweifaktor-Authentifizierung deaktivieren@@',
+    'Enable Two-factor auth' => '@@Zweifaktor-Authentifizierung aktivieren@@',
+    'Invalid two-factor code' => '@@Ungültiger Zweifaktor Schlüssel@@',
     'Registration ip' => '@@Registrierungs-IP@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?@@',
+    'Two Factor Authentication' => '@@Zweifaktor-Authentifizierung@@',
+    'Two factor successfully enabled.' => '@@Zweifaktor-Authentifizierung erfolgreich aktiviert.@@',
+    'Two-Factor Authentication' => '@@Zweifaktor-Authentifizierung@@',
+    'Two-factor auth protects you against stolen credentials' => '@@Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten@@',
+    'Two-factor authentication code' => '@@Zweifaktor-Authentifizierungsschlüssel@@',
+    'Two-factor authorization has been disabled.' => '@@Zweifaktor-Authentifizierung wurde deaktiviert.@@',
+    'Two-factor code' => '@@Zweifaktor-Schlüssel@@',
+    'Unable to disable two-factor authorization.' => '@@Unfähig die Zweifaktor-Authentifizierung zu deaktivieren.@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@Wir konnte die Bestätigungs E-Mail nicht erneut versenden@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@Wir haben Bestätigungs E-Mails an die neue und alte E-Mail Adresse versandt.@@',
     '(not set)' => '(nicht gesetzt)',
     'A confirmation message has been sent to your new email address' => 'Eine Bestätigungsnachricht wurde an Ihre neue E-Mail Adresse versandt',
+    'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Eine Nachricht wurde an Ihre E-Mail-Adresse gesendet. Sie enthält einen Bestätigungslink den Sie klicken müssen um die Registrierung abzuschließen.',
     'A new confirmation link has been sent' => 'Ein neuer Bestätigungs-Link wurde versendet',
     'A password will be generated automatically if not provided' => 'Leer lassen, um automatisch ein Passwort zu generieren',
     'Account' => 'Konto',
@@ -99,21 +63,33 @@ return [
     'Are you sure you want to block this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer blockieren wollen?',
     'Are you sure you want to confirm this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer bestätigen wollen?',
     'Are you sure you want to delete this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer löschen wollen?',
+    'Are you sure you want to switch to this user for the rest of this Session?' => 'Sind Sie sicher, dass Sie zu diesem Benutzer zu wechseln möchten für den Rest dieser Session?',
     'Are you sure you want to unblock this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer wieder freischalten wollen?',
+    'Are you sure you wish to send a password recovery email to this user?' => 'Sind Sie sicher, dass Sie eine Passwortwiederherstellungs-Mail an diesen Benutzer senden möchten?',
     'Are you sure? Deleted user can not be restored' => 'Sind Sie sicher? Gelöschte Benutzer können nicht wiederhergestellt werden',
     'Are you sure? There is no going back' => 'Sind Sie sicher? Es gibt kein Zurück',
     'Assignments' => 'Zuordnungen',
     'Assignments have been updated' => 'Zuordnungen wurden gespeichert',
     'Auth item with such name already exists' => 'Eine Berechtigung mit diesem Name existiert bereits',
+    'Authentication rule class {0} can not be instantiated' => 'Von der Authentifizierungsregel Klasse {0} kann keine Instanz erstellt werden',
     'Authorization item successfully created.' => 'Berechtigung erfolgreich erstellt',
     'Authorization item successfully removed.' => 'Berechtigung erfolgreich gelöscht',
     'Authorization item successfully updated.' => 'Berechtigung erfolgreich gespeichert',
+    'Authorization rule has been added.' => 'Berechtigungsregel wurde hinzugefügt.',
+    'Authorization rule has been removed.' => 'Berechtigungsregel wurde entfernt.',
+    'Authorization rule has been updated.' => 'Berechtigungsregel wurde gespeichert.',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Fast geschafft. Nun müssen Sie nur noch den Aktivierungslink besuchen, der an ihre neue E-Mail Adresse gesendet wurde.',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Fast geschafft. Nun müssen Sie nur noch den Aktivierungslink besuchen, der an ihre alte E-Mail Adresse gesendet wurde.',
     'Bio' => 'Bio',
     'Block' => 'Blockieren',
     'Block status' => 'Blockadestatus',
     'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => 'Blockiert am {0, date, dd. MMMM YYYY, HH:mm}',
+    'Cancel' => 'Abbrechen',
+    'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'Kann die Rolle "{0}" nicht zuordnen da der AuthManager in der Console Application nicht konfiguriert ist.',
     'Change your avatar at Gravatar.com' => 'Ändern Sie ihren Avatar auf Gravatar.com',
     'Children' => 'Unterelemente',
+    'Class' => 'Klasse',
+    'Close' => 'schließen',
     'Complete password reset on {0}' => 'Passwort-Wiederherstellung auf {0} fertigstellen',
     'Confirm' => 'Bestätigen',
     'Confirm account on {0}' => 'Konto auf {0} bestätigen',
@@ -129,6 +105,8 @@ return [
     'Create a user account' => 'Konto erstellen',
     'Create new permission' => 'Neue Berechtigung anlegen',
     'Create new role' => 'Neue Rolle anlegen',
+    'Create new rule' => 'Neue Regel erstellen',
+    'Created at' => 'Erstellt am',
     'Credentials will be sent to the user by email' => 'Die Zugangsdaten werden dem Nutzer per E-Mail versendet',
     'Current password' => 'Aktuelles Passwort',
     'Current password is not valid' => 'Das aktuelle Passwort ist nicht korrekt',
@@ -140,9 +118,12 @@ return [
     'Don\'t have an account? Sign up!' => 'Sie haben noch kein Konto? Registrieren!',
     'Email' => 'E-Mail',
     'Email (public)' => 'E-Mail (öffentlich)',
+    'Enable' => 'aktivieren',
     'Error occurred while changing password' => 'Fehler beim ändern des Passworts',
     'Error occurred while confirming user' => 'Fehler beim Bestätigen des Benutzers',
     'Error occurred while deleting user' => 'Fehler beim Löschen des Benutzers',
+    'Error sending registration message to "{email}". Please try again later.' => 'Fehler beim Senden der Registrierungsnachricht an "{email}". Bitte später noch einmal probieren.',
+    'Error sending welcome message to "{email}". Please try again later.' => 'Fehler beim Senden der Willkommensnachricht an "{email}". Bitte später noch einmal probieren.',
     'Finish' => 'Fertig',
     'Forgot password?' => 'Passwort vergessen?',
     'Gravatar email' => 'Gravatar E-Mail',
@@ -150,6 +131,7 @@ return [
     'If you already registered, sign in and connect this account on settings page' => 'Wenn Sie sich bereits registriert haben, melden Sie sich an und verbinden Sie dieses Konto auf der Einstellungs-Seite',
     'If you cannot click the link, please try pasting the text into your browser' => 'Wenn Sie den Link nicht anklicken können, versuchen Sie, diesen in ihre Browser-Leiste einzufügen',
     'If you did not make this request you can ignore this email' => 'Wenn Sie diese Anfrage nicht gemacht haben, können Sie diese E-Mail ignorieren',
+    'Impersonate this user' => 'Wechsle zu diesem Benutzer',
     'In order to complete your registration, please click the link below' => 'Um Ihre Registrierung abzuschliessen, klicken Sie bitte auf den Link unten',
     'In order to complete your request, please click the link below' => 'Um Ihre Anfrage abzuschliessen, klicken Sie bitte auf den Link unten',
     'In order to finish your registration, we need you to enter following fields' => 'Um Ihre Registrierung abzuschliessen, müssen Sie noch die folgenden Felder ausfüllen',
@@ -160,16 +142,19 @@ return [
     'It will be deleted forever' => 'Es wird permanent gelöscht',
     'Items' => 'Elemente',
     'Joined on {0, date}' => 'Mitglies seit {0, date}',
+    'Last login' => 'Letzter Login',
     'Location' => 'Ort',
     'Login' => 'Anmelden',
     'Logout' => 'Abmelden',
     'Manage users' => 'Nutzer verwalten',
     'Name' => 'Name',
     'Networks' => 'Netzwerke',
+    'Never' => 'Nie',
     'New email' => 'Neue E-Mail',
     'New password' => 'Neues Passwort',
     'New permission' => 'Neue Berechtigung',
     'New role' => 'Neue Rolle',
+    'New rule' => 'Neue Regel',
     'New user' => 'Neuer Benutzer',
     'Not blocked' => 'Nicht geblockt',
     'Not found' => 'Nicht gefunden',
@@ -192,17 +177,30 @@ return [
     'Registration time' => 'Registrierungszeit',
     'Remember me next time' => 'Anmeldung für das nächste mal merken',
     'Request new confirmation message' => 'Neuen Wiederherstellungs-Link anfordern',
+    'Required "key" cannot be empty.' => 'Erforderlicher "key" darf nicht leer sein.',
+    'Required "secret" cannot be empty.' => 'Erforderliches "secret" darf nicht leer sein.',
     'Reset your password' => 'Passwort wiederherstellen',
+    'Role "{0}" not found. Creating it.' => 'Rolle "{0}" nicht gefunden. Erstelle diese.',
     'Roles' => 'Rollen',
     'Rule' => 'Regel',
+    'Rule class must extend "yii\\rbac\\Rule".' => 'Regelklasse muss "yii\\rbac\\Rule" erweitern.',
     'Rule name' => 'Regelname',
+    'Rule name {0} is already in use' => 'Regelname {0} bereits in Benutzung',
+    'Rule {0} does not exists' => 'Regel {0} existiert nicht',
+    'Rule {0} not found.' => 'Regel {0} nicht gefunden.',
+    'Rules' => 'Regeln',
     'Save' => 'Speichern',
+    'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Scanne den Qr-Code mit der Google Authenticator App, dann füge den temporären Schlüssel in das Feld und sende es ab.',
+    'Send password recovery email' => 'Sende Mail zur Passwortwiederherstellung',
     'Sign in' => 'Anmelden',
     'Sign up' => 'Registrieren',
     'Something went wrong' => 'Etwas ist schiefgelaufen',
+    'Switch identities is disabled.' => 'Identitäten wechseln ist deaktiviert.',
     'Thank you for signing up on {0}' => 'Danke für ihre Registrierung auf {0}',
     'Thank you, registration is now complete.' => 'Danke, ihre Registrierung ist nun abgeschlossen.',
+    'The "recaptcha" component must be configured.' => 'Die "recaptcha" Komponente muss konfiguriert werden.',
     'The confirmation link is invalid or expired. Please try requesting a new one.' => 'Ihr Aktivierungslink ist falsch oder abgelaufen. Bitte fordern Sie einen neuen an.',
+    'The verification code is incorrect.' => 'Der Verifizierungsschlüssel ist ungültig.',
     'There is neither role nor permission with name "{0}"' => 'Es gibt weder eine Rolle noch eine Berechtigung mit dem Namen "{0}"',
     'This account has already been connected to another user' => 'Dieses Konto wurde bereits von einem anderen Benutzer verbunden',
     'This email address has already been taken' => 'Die E-Mail Adresse ist bereits vergeben',
@@ -212,10 +210,13 @@ return [
     'Unable to confirm user. Please, try again.' => 'Der Benutzer konnte nicht bestätigt werden. Bitte versuchen Sie es erneut.',
     'Unable to create an account.' => 'Konto konnte nicht erstellt werden',
     'Unable to create authorization item.' => 'Authorization Item konnte nicht erstellt werden',
+    'Unable to create new authorization rule.' => 'Unfähig eine neue Authentifizierungsregel zu erstellen.',
     'Unable to delete user. Please, try again later.' => 'Benutzer konnte nicht gelöscht werden.',
     'Unable to remove authorization item.' => 'Authorization Item konnte nicht gelöscht werden.',
     'Unable to send confirmation link' => 'Konnte Bestätigungslink nicht versenden',
+    'Unable to send recovery message to the user' => 'Unfähig die Wiederherstellungsnachricht an den Benutzer zu senden.',
     'Unable to update authorization item.' => 'Konnte Authorization item nicht ändern',
+    'Unable to update authorization rule.' => 'Unfähig die Berechtigungsregel zu speichern.',
     'Unable to update block status.' => 'Konnte den Block-Status nicht ändern',
     'Unblock' => 'Freischalten',
     'Unconfirmed' => 'Unbestätigt',
@@ -223,18 +224,26 @@ return [
     'Update assignments' => 'Zuweisung ändern',
     'Update permission' => 'Berechtigung ändern',
     'Update role' => 'Rolle ändern',
+    'Update rule' => 'Regel aktualisieren',
     'Update user account' => 'Konto ändern',
+    'Updated at' => 'Aktualisiert am',
+    'User account could not be created.' => 'Benutzerkonto konnte nicht erstellt werden.',
     'User block status has been updated.' => 'Der Status des Benutzer wurde gespeichert',
+    'User could not be registered.' => 'Benutzer konnte nicht registriert werden.',
     'User has been confirmed' => 'Benutzer wurde bestätigt',
     'User has been created' => 'Benutzer wurde angelegt',
     'User has been deleted' => 'Benutzer wurde gelöscht',
     'User is not found' => 'Benutzer wurde nicht gefunden',
+    'User not found.' => 'Benutzer nicht gefunden.',
     'Username' => 'Benutzername',
     'Users' => 'Benutzer',
     'VKontakte' => 'VKontakte',
+    'Verification failed. Please, enter new code.' => 'Verifizierung fehlgeschlagen. Bitte einen neuen Schlüssel eingeben.',
+    'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Wir konnten die Mail zur Bestätigung Ihrer Adresse nicht noch einmal senden. Bitte kontrollieren Sie ob die E-Mail-Adresse korrekt ist oder diese bereits bestätigt wurde.',
     'We have generated a password for you' => 'Ein Passwort wurde für Sie generiert',
     'We have received a request to change the email address for your account on {0}' => 'Wir haben eine Anfrage, ihre E-Mail Adresse auf {0} zu verändern, bekommen',
     'We have received a request to reset the password for your account on {0}' => 'Wir haben eine Anfrage, ihr Passwort auf {0} wiederherzustellen, bekommen',
+    'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Wir haben Ihnen Bestätigungslinks an die alte und neue E-Mail-Adresse geschickt. Sie müssen beide Links anklicken um die Anfrage fertigzustellen.',
     'Website' => 'Webseite',
     'Welcome to {0}' => 'Willkommen auf {0}',
     'Yandex' => 'Yandex',
@@ -254,4 +263,5 @@ return [
     'Your email address has been changed' => 'Ihre E-Mail Adresse wurde geändert',
     'Your profile has been updated' => 'Ihr Profil wurde gespeichert',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd. MMMM YYYY, HH:mm}',
+    '{0} cannot be blank.' => '{0} darf nicht leer sein.',
 ];
diff --git a/src/User/resources/i18n/es/usuario.php b/src/User/resources/i18n/es/usuario.php
index eb31f3d..3aebcb9 100644
--- a/src/User/resources/i18n/es/usuario.php
+++ b/src/User/resources/i18n/es/usuario.php
@@ -17,10 +17,28 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Error sending registration message to "{email}". Please try again later.' => 'Ha ocurrido un error enviando el mensaje de registro a "{email}". Por favor inténtalo de nuevo más tarde.',
-    'Error sending welcome message to "{email}". Please try again later.' => 'Ha ocurrido un error al enviar el mensaje de bienvenida a "{email}". Por favor inténtalo de nuevo más tarde.',
-    'User account could not be created.' => 'La cuenta de usuario no ha podido ser creada.',
-    'User could not be registered.' => 'El usuario no ha podido ser registrado.',
+    'Disable two factor authentication' => '',
+    'Enable two factor authentication' => '',
+    'Invalid two factor authentication code' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
+    'Disable Two-Factor Auth' => '@@Desabilitar autenticación de dos factores@@',
+    'Enable Two-factor auth' => '@@Habilitar autenticación de dos factores@@',
+    'Invalid two-factor code' => '@@Código de dos factores inválido@@',
+    'This will disable two-factor auth. Are you sure?' => '@@Esto inhabilitará la autenticación de dos factores. Estás seguro?@@',
+    'Two Factor Authentication' => '@@Autenticación de Dos Factores@@',
+    'Two factor successfully enabled.' => '@@Autenticación de dos factores habilitada con éxito.@@',
+    'Two-Factor Authentication' => '@@Autenticación de Dos Factores@@',
+    'Two-factor auth protects you against stolen credentials' => '@@La autenticación te protege contra el robo de credenciales@@',
+    'Two-factor authentication code' => '@@Código de doble autenticación@@',
+    'Two-factor authorization has been disabled.' => '@@La autenticación de dos factores ha sido inhabilitada.@@',
+    'Two-factor code' => '@@Código de dos factores@@',
+    'Unable to disable two-factor authorization.' => '@@Ha sido imposible inhabilitar al autenticación de dos factores.@@',
     '(not set)' => '(sin establecer)',
     'A confirmation message has been sent to your new email address' => 'Se ha enviado un mensaje de confirmación a tu nueva dirección de correo electrónico',
     'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Un mensaje ha sido enviado a tu dirección de correo electrónico. Contiene un vínculo de confirmación que tienes que seguir para completar el registro.',
@@ -88,23 +106,23 @@ return [
     'Delete account' => 'Eliminar cuenta',
     'Description' => 'Descripción',
     'Didn\'t receive confirmation message?' => '¿No has recibido el mensaje de confirmación?',
-    'Disable Two-Factor Auth' => 'Desabilitar autenticación de dos factores',
     'Disconnect' => 'Desconectar',
     'Don\'t have an account? Sign up!' => '¿No tienes cuenta? ¡Regístrate!',
     'Email' => 'Correo electrónico',
     'Email (public)' => 'Correo electrónico (público)',
     'Enable' => 'Habilitar',
-    'Enable Two-factor auth' => 'Habilitar autenticación de dos factores',
     'Error occurred while changing password' => 'Se ha producido un error al cambiar la contraseña',
     'Error occurred while confirming user' => 'Se ha producido un error al confirmar el usuario',
     'Error occurred while deleting user' => 'Se ha producido un error al eliminar el usuario',
+    'Error sending registration message to "{email}". Please try again later.' => 'Ha ocurrido un error enviando el mensaje de registro a "{email}". Por favor inténtalo de nuevo más tarde.',
+    'Error sending welcome message to "{email}". Please try again later.' => 'Ha ocurrido un error al enviar el mensaje de bienvenida a "{email}". Por favor inténtalo de nuevo más tarde.',
     'Finish' => 'Finalizar',
     'Forgot password?' => '¿Olvidaste la contraseña?',
     'Gravatar email' => 'Correo electrónico Gravatar',
     'Hello' => 'Hola',
-    'If you already registered, sign in and connect this account on settings page' => 'Si ya está registrados, inicie sesión y conecta esta cuenta en la página de configuración',
-    'If you cannot click the link, please try pasting the text into your browser' => 'Si tienes problemas, por favor, pegua la siguiente dirección URL en su navegador web',
-    'If you did not make this request you can ignore this email' => 'PD: Si ha recibido este correo electrónico por error, simplemente elimínelo',
+    'If you already registered, sign in and connect this account on settings page' => 'Si ya estas registrado, inicia sesión y conecta esta cuenta en la página de configuración',
+    'If you cannot click the link, please try pasting the text into your browser' => 'Si tienes problemas, por favor, pega la siguiente dirección URL en tu navegador web',
+    'If you did not make this request you can ignore this email' => 'PD: Si has recibido este correo electrónico por error, simplemente elimínalo',
     'Impersonate this user' => 'Personificar este usuario',
     'In order to complete your registration, please click the link below' => 'Para completar el registro, por favor haz clic en el siguiente enlance',
     'In order to complete your request, please click the link below' => 'Para completar tu petición, haz clic en el siguiente enlace',
@@ -112,7 +130,6 @@ return [
     'Information' => 'Información',
     'Invalid login or password' => 'Usuario o contraseña incorrectos',
     'Invalid or expired link' => 'Enlace inválido o caducado',
-    'Invalid two-factor code' => 'Código de dos factores inválido',
     'Invalid value' => 'Valor inválido',
     'It will be deleted forever' => 'Será eliminado para siempre',
     'Items' => 'Elementos',
@@ -180,22 +197,13 @@ return [
     'This account has already been connected to another user' => 'Esta cuenta ya está conectada con otro usuario',
     'This email address has already been taken' => 'Esta cuenta de correo electrónico ya está siendo utilizada',
     'This username has already been taken' => 'El nombre de usuario ya está siendo utlizado',
-    'This will disable two-factor auth. Are you sure?' => 'Esto inhabilitará la autenticación de dos factores. Estás seguro?',
     'Time zone' => 'Zona horaria',
     'Time zone is not valid' => 'La zona horaria no es válida',
-    'Two Factor Authentication' => 'Autenticación de Dos Factores',
-    'Two factor successfully enabled.' => 'Autenticación de dos factores habilitada con éxito.',
-    'Two-Factor Authentication' => 'Autenticación de Dos Factores',
-    'Two-factor auth protects you against stolen credentials' => 'La autenticación te protege contra el robo de credenciales',
-    'Two-factor authentication code' => 'Código de doble autenticación',
-    'Two-factor authorization has been disabled.' => 'La autenticación de dos factores ha sido inhabilitada.',
-    'Two-factor code' => 'Código de dos factores',
     'Unable to confirm user. Please, try again.' => 'No se ha podido confirmar el usuario. Por favor, inténtalo de nuevo.',
     'Unable to create an account.' => 'No se ha podido crear la cuenta.',
     'Unable to create authorization item.' => 'No se puede actualizar el elemento de autorización.',
     'Unable to create new authorization rule.' => 'Ha sido imposible crear la nueva regla de autenticación.',
     'Unable to delete user. Please, try again later.' => 'No se ha podido eliminar el usuario. Por favor, inténtalo más tarde.',
-    'Unable to disable two-factor authorization.' => 'Ha sido imposible inhabilitar al autenticación de dos factores.',
     'Unable to remove authorization item.' => 'No se ha podido eliminar el elemento de autorización.',
     'Unable to send confirmation link' => 'No se ha podido enviar el enlace de confirmación',
     'Unable to send recovery message to the user' => 'Ha sido imposible enviar el email de recuperación de contraseña',
@@ -211,7 +219,9 @@ return [
     'Update rule' => 'Actualiza regla',
     'Update user account' => 'Actualizar cuenta',
     'Updated at' => 'Actualizado el',
+    'User account could not be created.' => 'La cuenta de usuario no ha podido ser creada.',
     'User block status has been updated.' => 'El estado de bloqueo del usuario ha sido actualizado.',
+    'User could not be registered.' => 'El usuario no ha podido ser registrado.',
     'User has been confirmed' => 'El usuario ha sido confirmado',
     'User has been created' => 'El usuario ha sido creado',
     'User has been deleted' => 'El usuario ha sido eliminado',
diff --git a/src/User/resources/i18n/fa-IR/usuario.php b/src/User/resources/i18n/fa-IR/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/fa-IR/usuario.php
+++ b/src/User/resources/i18n/fa-IR/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/fi/usuario.php b/src/User/resources/i18n/fi/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/fi/usuario.php
+++ b/src/User/resources/i18n/fi/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/fr/usuario.php b/src/User/resources/i18n/fr/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/fr/usuario.php
+++ b/src/User/resources/i18n/fr/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/hr/usuario.php b/src/User/resources/i18n/hr/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/hr/usuario.php
+++ b/src/User/resources/i18n/hr/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/hu/usuario.php b/src/User/resources/i18n/hu/usuario.php
index 0f1d9cd..549986d 100644
--- a/src/User/resources/i18n/hu/usuario.php
+++ b/src/User/resources/i18n/hu/usuario.php
@@ -24,12 +24,12 @@ return [
     'Cancel' => '',
     'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => '',
     'Close' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Last login' => '',
     'Never' => '',
     'Required "key" cannot be empty.' => '',
@@ -39,15 +39,13 @@ return [
     'Send password recovery email' => '',
     'The "recaptcha" component must be configured.' => '',
     'The verification code is incorrect.' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to send recovery message to the user' => '',
     'User account could not be created.' => '',
     'User could not be registered.' => '',
@@ -58,6 +56,18 @@ return [
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@Üzenet érkezett az e-mail címedre.@@',
     'Awesome, almost there. ' => '@@Szuper, majdnem kész.@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@A cím megerősítéséhez nem tudtuk újra elküldeni az e-mailt.@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@Megerősítő linkeket küldtünk régi és új e-mail címekre.@@',
     '(not set)' => '(nincs beállítva)',
diff --git a/src/User/resources/i18n/it/usuario.php b/src/User/resources/i18n/it/usuario.php
index cfad813..6fd7758 100644
--- a/src/User/resources/i18n/it/usuario.php
+++ b/src/User/resources/i18n/it/usuario.php
@@ -17,49 +17,43 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '',
-    'Are you sure you wish to send a password recovery email to this user?' => '',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => '',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => '',
-    'Cancel' => '',
-    'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => '',
-    'Close' => '',
-    'Disable Two-Factor Auth' => '',
-    'Enable' => '',
-    'Enable Two-factor auth' => '',
-    'Error sending registration message to "{email}". Please try again later.' => '',
-    'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Invalid two-factor code' => '',
-    'Last login' => '',
-    'Never' => '',
-    'Required "key" cannot be empty.' => '',
-    'Required "secret" cannot be empty.' => '',
-    'Role "{0}" not found. Creating it.' => '',
-    'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
-    'Send password recovery email' => '',
-    'The "recaptcha" component must be configured.' => '',
-    'The verification code is incorrect.' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
-    'Unable to disable two-factor authorization.' => '',
-    'Unable to send recovery message to the user' => '',
-    'User account could not be created.' => '',
-    'User could not be registered.' => '',
-    'User not found.' => '',
-    'Verification failed. Please, enter new code.' => '',
-    'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => '',
-    'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => '',
-    '{0} cannot be blank.' => '',
-    'A message has been sent to your email address. ' => '@@È stato inviato un messaggio al tuo indirizzo email@@',
-    'Awesome, almost there. ' => '@@Fantastico, ci siamo quasi. @@',
-    'We couldn\'t re-send the mail to confirm your address. ' => '@@Non è stato possibile reinviare l\'email per confermare il tuo indirizzo. @@',
-    'We have sent confirmation links to both old and new email addresses. ' => '@@Abbiamo inviato un link di conferma sia al nuovo che al vecchio indirizzo email. @@',
+    'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'È stato inviato un messaggio al tuo indirizzo email. Contiene un collegamento di verifica che devi aprire per completare la registrazione.',
+    'Are you sure you wish to send a password recovery email to this user?' => 'Sicuro di voler inviare un email di recupero password a questo utente?',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Fantastico, ci siamo quasi. Ora devi solo visitare il collegamento di conferma che è stato inviato al tuo nuovo indirizzo email.',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Fantastico, ci siamo quasi. Ora devi solo visitare il collegamento di conferma che è stato inviato al tuo vecchio indirizzo email.',
+    'Cancel' => 'Annulla',
+    'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'Impossibile assegnare il ruolo "{0}" perché l\'AuthManager non è configurato nella applicazione da console.',
+    'Close' => 'Chiudi',
+    'Disable two factor authentication' => 'Disabilita autenticazione a due fattori',
+    'Enable' => 'Abilita',
+    'Enable two factor authentication' => 'Abilita l\'autenticazione a due fattori',
+    'Error sending registration message to "{email}". Please try again later.' => 'C\'è stato un errore nell\'invio del messaggio di registrazione all\'indirizzo "{email}". Per favore ritenta più tardi.',
+    'Error sending welcome message to "{email}". Please try again later.' => 'C\'è stato un errore nell\'invio del messaggio di benvenuto all\'indirizzo "{email}". Per favore ritenta più tardi.',
+    'Invalid two factor authentication code' => 'Il codice dell\'autenticazione a due fattori non è valido',
+    'Last login' => 'Ultimo accesso',
+    'Never' => 'Mai',
+    'Required "key" cannot be empty.' => 'Il campo "chiave" è richiesto, non può essere vuoto.',
+    'Required "secret" cannot be empty.' => 'Il campo "segreto" è richiesto, non può essere vuoto.',
+    'Role "{0}" not found. Creating it.' => 'Ruolo "{0}" non trovato. È stato creato.',
+    'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Scansiona il codice QR con l\'applicazione Google Authenticator, poi inserisci il codice temporaneo nel riquadro ed invia.',
+    'Send password recovery email' => 'Invia email di recupero password',
+    'The "recaptcha" component must be configured.' => 'Occorre configurare il componente "recaptcha".',
+    'The verification code is incorrect.' => 'Il codice di verifica non è corretto.',
+    'This will disable two factor authentication. Are you sure?' => 'Stai per disabilitare l\'autenticazione a due fattori. Sei sicuro?',
+    'Two Factor Authentication (2FA)' => 'Autenticazione a due fattori (2FA)',
+    'Two factor authentication code' => 'Codice di autenticazione a due fattori',
+    'Two factor authentication has been disabled.' => 'Autenticazione a due fattori disabilitata.',
+    'Two factor authentication protects you against stolen credentials' => 'L\'autenticazione a due fattori può proteggerti dal furto di credenziali',
+    'Two factor authentication successfully enabled.' => 'Autenticazione a due fattori abilitata con successo.',
+    'Unable to disable Two factor authentication.' => 'Impossibile disabilitare l\'autenticazione a due fattori.',
+    'Unable to send recovery message to the user' => 'Impossibile inviare il messaggio di recupero password all\'utente',
+    'User account could not be created.' => 'Impossibile creare il nuovo utente.',
+    'User could not be registered.' => 'Impossibile registrare l\'utente.',
+    'User not found.' => 'Utente non trovato.',
+    'Verification failed. Please, enter new code.' => 'Verifica fallita. Per favore inserisci un nuovo codice.',
+    'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Non siamo riusciti ad inviare una email di conferma al tuo indirizzo. Per favore verifica che sia corretto e che non sia già stato confermato.',
+    'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Abbiamo inviato un link di conferma sia al vecchio che al nuovo indirizzo email. Devi visitare entrambi i link per completare la richiesta.',
+    '{0} cannot be blank.' => '{0} non può essere vuoto.',
     '(not set)' => '(non impostato)',
     'A confirmation message has been sent to your new email address' => 'È stato inviato un messaggio di conferma al tuo nuovo indirizzo email',
     'A new confirmation link has been sent' => 'È stato inviato un nuovo link di conferma',
@@ -198,7 +192,7 @@ return [
     'There is neither role nor permission with name "{0}"' => 'Non esiste un ruolo o permesso di nome "{0}',
     'This account has already been connected to another user' => 'Questo account è già stato associato ad un altro utente',
     'This email address has already been taken' => 'Questo indirizzo email è già stato registrato',
-    'This username has already been taken' => 'Questo nome utente è già stato registraot',
+    'This username has already been taken' => 'Questo nome utente è già stato registrato',
     'Time zone' => 'Fuso orario',
     'Time zone is not valid' => 'Il fuso orario non è valido',
     'Unable to confirm user. Please, try again.' => 'Impossibile confermare l\'utente, per favore ritenta.',
diff --git a/src/User/resources/i18n/kk/usuario.php b/src/User/resources/i18n/kk/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/kk/usuario.php
+++ b/src/User/resources/i18n/kk/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/lt/usuario.php b/src/User/resources/i18n/lt/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/lt/usuario.php
+++ b/src/User/resources/i18n/lt/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/nl/usuario.php b/src/User/resources/i18n/nl/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/nl/usuario.php
+++ b/src/User/resources/i18n/nl/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/pl/usuario.php b/src/User/resources/i18n/pl/usuario.php
index 933b49b..27acdc3 100644
--- a/src/User/resources/i18n/pl/usuario.php
+++ b/src/User/resources/i18n/pl/usuario.php
@@ -19,18 +19,40 @@
 return [
     'Are you sure you wish to send a password recovery email to this user?' => '',
     'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => '',
+    'Disable two factor authentication' => '',
+    'Enable two factor authentication' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
+    'Invalid two factor authentication code' => '',
     'Required "key" cannot be empty.' => '',
     'Required "secret" cannot be empty.' => '',
     'Role "{0}" not found. Creating it.' => '',
     'Send password recovery email' => '',
     'The "recaptcha" component must be configured.' => '',
     'The verification code is incorrect.' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to send recovery message to the user' => '',
     'User account could not be created.' => '',
     'User could not be registered.' => '',
     '{0} cannot be blank.' => '',
+    'Disable Two-Factor Auth' => '@@Wyłącz uwierzytelnianie dwuetapowe@@',
+    'Enable Two-factor auth' => '@@Włącz uwierzytelnianie dwuetapowe@@',
+    'Invalid two-factor code' => '@@Nieprawidłowy kod uwierzytelniania dwuetapowego@@',
+    'This will disable two-factor auth. Are you sure?' => '@@To wyłączy uwierzytelnianie dwuetapowe. Czy jesteś pewny?@@',
+    'Two Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@',
+    'Two factor successfully enabled.' => '@@Dwuetapowe uwierzytelnianie poprawnie włączone.@@',
+    'Two-Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@',
+    'Two-factor auth protects you against stolen credentials' => '@@Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania@@',
+    'Two-factor authentication code' => '@@Kod uwierzytelniania dwuetapowego@@',
+    'Two-factor authorization has been disabled.' => '@@Dwuetapowa autoryzacja została wyłączona.@@',
+    'Two-factor code' => '@@Kod dwuetapowy@@',
+    'Unable to disable two-factor authorization.' => '@@Nie można wyłączyć dwuetapowej autoryzacji.@@',
     '(not set)' => '(nie podano)',
     'A confirmation message has been sent to your new email address' => 'Potwierdzenie zostało wysłane na Twój nowy adres email',
     'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Wysłaliśmy wiadomość na Twój adres email, zawierającą link aktywacyjny, w który musisz kliknąć, aby zakończyć rejestrację.',
@@ -96,13 +118,11 @@ return [
     'Delete account' => 'Usuń konto',
     'Description' => 'Opis',
     'Didn\'t receive confirmation message?' => 'Nie otrzymałeś emaila aktywacyjnego?',
-    'Disable Two-Factor Auth' => 'Wyłącz uwierzytelnianie dwuetapowe',
     'Disconnect' => 'Odłącz',
     'Don\'t have an account? Sign up!' => 'Nie masz jeszcze konto? Zarejestruj się!',
     'Email' => 'Email',
     'Email (public)' => 'Email (publiczny)',
     'Enable' => 'Włącz',
-    'Enable Two-factor auth' => 'Włącz uwierzytelnianie dwuetapowe',
     'Error occurred while changing password' => 'Wystąpił błąd podczas zmiany hasła',
     'Error occurred while confirming user' => 'Wystąpił błąd podczas aktywacji użytkownika',
     'Error occurred while deleting user' => 'Wystąpił błąd podczas usuwania użytkownika',
@@ -120,7 +140,6 @@ return [
     'Information' => 'Informacja',
     'Invalid login or password' => 'Nieprawidłowy login lub hasło',
     'Invalid or expired link' => 'Nieprawidłowy lub zdezaktualizowany link',
-    'Invalid two-factor code' => 'Nieprawidłowy kod uwierzytelniania dwuetapowego',
     'Invalid value' => 'Nieprawidłowa wartość',
     'It will be deleted forever' => 'Usuniętych kont nie można przywrócić',
     'Items' => 'Elementy',
@@ -182,22 +201,13 @@ return [
     'This account has already been connected to another user' => 'To konto zostało już dołączone do innego użytkownika',
     'This email address has already been taken' => 'Ten adres email jest już używany',
     'This username has already been taken' => 'Ta nazwa użytkownika jest już zajęta',
-    'This will disable two-factor auth. Are you sure?' => 'To wyłączy uwierzytelnianie dwuetapowe. Czy jesteś pewny?',
     'Time zone' => 'Strefa czasowa',
     'Time zone is not valid' => 'Strefa czasowa jest niepoprawna',
-    'Two Factor Authentication' => 'Uwierzytelnianie dwuetapowe',
-    'Two factor successfully enabled.' => 'Dwuetapowe uwierzytelnianie poprawnie włączone.',
-    'Two-Factor Authentication' => 'Uwierzytelnianie dwuetapowe',
-    'Two-factor auth protects you against stolen credentials' => 'Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania',
-    'Two-factor authentication code' => 'Kod uwierzytelniania dwuetapowego',
-    'Two-factor authorization has been disabled.' => 'Dwuetapowa autoryzacja została wyłączona.',
-    'Two-factor code' => 'Kod dwuetapowy',
     'Unable to confirm user. Please, try again.' => 'Nie można aktywować użytkownika. Proszę spróbować ponownie.',
     'Unable to create an account.' => 'Nie można utworzyć konta.',
     'Unable to create authorization item.' => 'Nie można utworzyć celu autoryzacji.',
     'Unable to create new authorization rule.' => 'Nie można utworzyć zasady autoryzacji.',
     'Unable to delete user. Please, try again later.' => 'Nie można usunąć użytkownika. Proszę spróbować ponownie później.',
-    'Unable to disable two-factor authorization.' => 'Nie można wyłączyć dwuetapowej autoryzacji.',
     'Unable to remove authorization item.' => 'Nie można usunąć celu autoryzacji.',
     'Unable to send confirmation link' => 'Nie można wysłać linka aktywacyjnego',
     'Unable to update authorization item.' => 'Nie można zaktualizować celu autoryzacji.',
diff --git a/src/User/resources/i18n/pt-BR/usuario.php b/src/User/resources/i18n/pt-BR/usuario.php
index 36c7e4f..e68c3b6 100644
--- a/src/User/resources/i18n/pt-BR/usuario.php
+++ b/src/User/resources/i18n/pt-BR/usuario.php
@@ -17,6 +17,36 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Disable two factor authentication' => '',
+    'Enable two factor authentication' => '',
+    'Invalid two factor authentication code' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
+    'A message has been sent to your email address. ' => '@@Uma mensagem foi enviada para o seu endereço de e-mail.@@',
+    'Awesome, almost there. ' => '@@Incrível, quase lá.@@',
+    'Class "{0}" does not exist' => '@@A classe "{0}" não existe@@',
+    'Disable Two-Factor Auth' => '@@Desabilitar autenticação em dois fatores@@',
+    'Enable Two-factor auth' => '@@Habilitar autenticação em dois fatores@@',
+    'Invalid two-factor code' => '@@Código de dois fatores inválido@@',
+    'Registration ip' => '@@Registro ip@@',
+    'Rule class can not be instantiated' => '@@A classe de regras não pode ser instanciada@@',
+    'Rule class must extend "yii\\rbac\\Rule"' => '@@A classe de regras deve estender de "yii\\rbac\\Rule"@@',
+    'This will disable two-factor auth. Are you sure?' => '@@Isso desativará a autenticação de dois fatores. Você tem certeza?@@',
+    'Two Factor Authentication' => '@@Autenticação de dois fatores@@',
+    'Two factor successfully enabled.' => '@@Dois fatores habilitados com sucesso.@@',
+    'Two-Factor Authentication' => '@@Autenticação de dois fatores@@',
+    'Two-factor auth protects you against stolen credentials' => '@@Autenticação de dois fatores protege você contra credenciais roubadas@@',
+    'Two-factor authentication code' => '@@Código de autenticação de dois fatores@@',
+    'Two-factor authorization has been disabled.' => '@@A autorização de dois fatores foi desabilitada.@@',
+    'Two-factor code' => '@@Código de dois fatores@@',
+    'Unable to disable two-factor authorization.' => '@@Não é possível desabilitar a autorização de dois fatores.@@',
+    'We couldn\'t re-send the mail to confirm your address. ' => '@@Não poderíamos re-enviar o correio para confirmar o seu endereço.@@',
+    'We have sent confirmation links to both old and new email addresses. ' => '@@Enviamos links de confirmação para endereços de e-mail antigo e novo.@@',
     '(not set)' => '(não informado)',
     'A confirmation message has been sent to your new email address' => 'Uma mensagem de confirmação foi enviada para seu novo endereço de e-mail',
     'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Uma mensagem foi enviada para o seu endereço de e-mail. Ele contém um link de confirmação que você deve clicar para completar o registro.',
@@ -84,13 +114,11 @@ return [
     'Delete account' => 'Excluir conta',
     'Description' => 'Descrição',
     'Didn\'t receive confirmation message?' => 'Não recebeu mensagem de confirmação?',
-    'Disable Two-Factor Auth' => 'Desabilitar autenticação em dois fatores',
     'Disconnect' => 'Desconectar',
     'Don\'t have an account? Sign up!' => 'Não tem uma conta? Inscrever-se!',
     'Email' => 'Email',
     'Email (public)' => 'Email (publico)',
     'Enable' => 'Habilitado',
-    'Enable Two-factor auth' => 'Habilitar autenticação em dois fatores',
     'Error occurred while changing password' => 'Ocorreu um erro ao mudar a senha',
     'Error occurred while confirming user' => 'Ocorreu um erro ao confirmar o usuário',
     'Error occurred while deleting user' => 'Ocorreu um erro ao excluir o usuário',
@@ -110,7 +138,6 @@ return [
     'Information' => 'Informação',
     'Invalid login or password' => 'Login ou senha inválidos',
     'Invalid or expired link' => 'Link inválido ou expirado',
-    'Invalid two-factor code' => 'Código de dois fatores inválido',
     'Invalid value' => 'Valor inválido',
     'It will be deleted forever' => 'Ele será excluído para sempre',
     'Items' => 'Itens',
@@ -178,22 +205,13 @@ return [
     'This account has already been connected to another user' => 'Esta conta já foi conectada a outro usuário',
     'This email address has already been taken' => 'Este endereço de e-mail já foi feito',
     'This username has already been taken' => 'Este nome de usuário já foi feito',
-    'This will disable two-factor auth. Are you sure?' => 'Isso desativará a autenticação de dois fatores. Você tem certeza?',
     'Time zone' => 'Fuso horário',
     'Time zone is not valid' => 'O fuso horário não é válido',
-    'Two Factor Authentication' => 'Autenticação de dois fatores',
-    'Two factor successfully enabled.' => 'Dois fatores habilitados com sucesso.',
-    'Two-Factor Authentication' => 'Autenticação de dois fatores',
-    'Two-factor auth protects you against stolen credentials' => 'Autenticação de dois fatores protege você contra credenciais roubadas',
-    'Two-factor authentication code' => 'Código de autenticação de dois fatores',
-    'Two-factor authorization has been disabled.' => 'A autorização de dois fatores foi desabilitada.',
-    'Two-factor code' => 'Código de dois fatores',
     'Unable to confirm user. Please, try again.' => 'Não é possível confirmar o usuário. Por favor, tente novamente.',
     'Unable to create an account.' => 'Não é possível criar uma conta.',
     'Unable to create authorization item.' => 'Não foi possível criar o item de autorização.',
     'Unable to create new authorization rule.' => 'Não é possível criar uma nova regra de autorização.',
     'Unable to delete user. Please, try again later.' => 'Não é possível excluir o usuário. Por favor, tente novamente mais tarde.',
-    'Unable to disable two-factor authorization.' => 'Não é possível desabilitar a autorização de dois fatores.',
     'Unable to remove authorization item.' => 'Não é possível remover o item de autorização.',
     'Unable to send confirmation link' => 'Não é possível enviar o link de confirmação',
     'Unable to send recovery message to the user' => 'Não é possível enviar uma mensagem de recuperação para o usuário',
@@ -246,12 +264,4 @@ return [
     'Your profile has been updated' => 'Seu perfil foi atualizado',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, MMMM dd, YYYY HH:mm}',
     '{0} cannot be blank.' => '{0} não pode estar em branco',
-    'A message has been sent to your email address. ' => 'Uma mensagem foi enviada para o seu endereço de e-mail.',
-    'Awesome, almost there. ' => 'Incrível, quase lá.',
-    'Class "{0}" does not exist' => 'A classe "{0}" não existe',
-    'Registration ip' => 'Registro ip',
-    'Rule class can not be instantiated' => 'A classe de regras não pode ser instanciada',
-    'Rule class must extend "yii\\rbac\\Rule"' => 'A classe de regras deve estender de "yii\\rbac\\Rule"',
-    'We couldn\'t re-send the mail to confirm your address. ' => 'Não poderíamos re-enviar o correio para confirmar o seu endereço.',
-    'We have sent confirmation links to both old and new email addresses. ' => 'Enviamos links de confirmação para endereços de e-mail antigo e novo.',
 ];
diff --git a/src/User/resources/i18n/pt-PT/usuario.php b/src/User/resources/i18n/pt-PT/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/pt-PT/usuario.php
+++ b/src/User/resources/i18n/pt-PT/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/ro/usuario.php b/src/User/resources/i18n/ro/usuario.php
index f8b45e4..eafd205 100644
--- a/src/User/resources/i18n/ro/usuario.php
+++ b/src/User/resources/i18n/ro/usuario.php
@@ -24,12 +24,12 @@ return [
     'Cancel' => '',
     'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => '',
     'Close' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Last login' => '',
     'Never' => '',
     'Required "key" cannot be empty.' => '',
@@ -39,15 +39,13 @@ return [
     'Send password recovery email' => '',
     'The "recaptcha" component must be configured.' => '',
     'The verification code is incorrect.' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to send recovery message to the user' => '',
     'User account could not be created.' => '',
     'User could not be registered.' => '',
@@ -58,6 +56,18 @@ return [
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@A fost trimis un mesaj la adresa dvs. de e-mail.@@',
     'Awesome, almost there. ' => '@@Minunat, aproape acolo.@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@Nu am putut retrimite mesajul pentru a vă confirma adresa.@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@Am trimis linkuri de confirmare adresa de e-mail vechi și cel noi.@@',
     '(not set)' => '(nu este setat)',
diff --git a/src/User/resources/i18n/ru/usuario.php b/src/User/resources/i18n/ru/usuario.php
index d7fe376..35a2535 100644
--- a/src/User/resources/i18n/ru/usuario.php
+++ b/src/User/resources/i18n/ru/usuario.php
@@ -17,55 +17,39 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'На вашу электронную почту было отправлено сообщение со ссылкой подтверждения регистрации.',
-    'Are you sure you wish to send a password recovery email to this user?' => 'Вы уверены, что хотите отправить письмо с восстановлением пароля на почту этому пользователю?',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Замечательно, почти готово. Вам осталось перейти по ссылке подтверждения, отправленной на новый адрес вашей электронной почты.',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Замечательно, почти готово. Вам осталось перейти по ссылке подтверждения, отправленной на старый адрес вашей электронной почты.',
-    'Cancel' => 'Отменить',
-    'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'В вашем консольном приложении не настроен AuthManager, поэтому не удалось назначить роль "{0}".',
-    'Close' => 'Закрыть',
-    'Disable Two-Factor Auth' => 'Отключить двухфакторную авторизацию',
-    'Enable' => 'Включить',
-    'Enable Two-factor auth' => 'Включить двухфакторную авторизацию',
-    'Error sending registration message to "{email}". Please try again later.' => 'Ошибка при отправке письма о регистрации на "{email}". Пожалуйста, попробуйте позже.',
-    'Error sending welcome message to "{email}". Please try again later.' => 'Ошибка при отправке приветственного письма на "{email}". Пожалуйста, попробуйте позже.',
-    'Invalid two-factor code' => 'Неверный код двухфакторной авторизации',
-    'Last login' => 'Последний вход',
-    'Never' => 'Никогда',
-    'Required "key" cannot be empty.' => 'Поле "key" не может быть пустым.',
-    'Required "secret" cannot be empty.' => 'Поле "secret" не может быть пустым.',
-    'Role "{0}" not found. Creating it.' => 'Роль "{0}" не найдена. Создаём её.',
-    'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Просканируйте QR-код приложением Google Authenticator App, затем вставьте временный код в поле и отправьте.',
-    'Send password recovery email' => 'Отправить письмо с восстановлением пароля',
-    'The "recaptcha" component must be configured.' => 'Необходимо настроить компонент "recaptcha"',
-    'The verification code is incorrect.' => 'Неправильный код подтверждения.',
-    'This will disable two-factor auth. Are you sure?' => 'Вы уверены, что хотите отключить двухфакторную авторизацию?',
-    'Two Factor Authentication' => 'Двухфакторная авторизация',
-    'Two factor successfully enabled.' => 'Включена двухфакторная авторизация.',
-    'Two-Factor Authentication' => 'Двухфакторная авторизация',
-    'Two-factor auth protects you against stolen credentials' => 'Двухфакторная авторизация предотвращает кражу ваших данных для входа.',
-    'Two-factor authentication code' => 'Код двухфакторной авторизации',
-    'Two-factor authorization has been disabled.' => 'Двухфакторная авторизация отключена.',
-    'Two-factor code' => 'Код двухфакторной авторизации',
-    'Unable to disable two-factor authorization.' => 'Не удалось отключить двухфакторную авторизацию.',
-    'Unable to send recovery message to the user' => 'Не удалось отправить пользователю письмо восстановления',
-    'User account could not be created.' => 'Не удалось создать аккаунт для пользователя.',
-    'User could not be registered.' => 'Не удалось зарегистрировать пользователя.',
-    'User not found.' => 'Пользователь не найден.',
-    'Verification failed. Please, enter new code.' => 'Проверка не удалась. Пожауйста, введите новый код',
-    'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Не удалось повторно отправить письмо для подтверждения вашего адреса электронной почты. Пожалуйста, проверьте, что ввели корректный адрес или что он ещё не был подтверждён.',
-    'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Мы отправили письма на ваш старый и новый адреса. Вы должны перейти по обеим ссылкам, чтобы завершить процесс смены адреса.',
-    '{0} cannot be blank.' => '{0} не может быть пустым.',
+    'Disable two factor authentication' => 'Выключить двухфакторную авторизацию',
+    'Enable two factor authentication' => 'Включить двухфакторную авторизацию',
+    'Invalid two factor authentication code' => 'Неверный код двухфакторной авторизации',
+    'This will disable two factor authentication. Are you sure?' => 'Двухфакторная авторизация будет отключена. Вы уверены?',
+    'Two Factor Authentication (2FA)' => 'Двухфакторная авторизация (2FA)',
+    'Two factor authentication code' => 'Код двухфакторной авторизации',
+    'Two factor authentication has been disabled.' => 'Двухфакторная авторизация отключена.',
+    'Two factor authentication protects you against stolen credentials' => 'Двухфакторная авторизация защитит вас от кражи параметров доступа',
+    'Two factor authentication successfully enabled.' => 'Двухфакторная авторизация успешно включена.',
+    'Unable to disable Two factor authentication.' => 'Не удалось отключить двухфакторную авторизацию.',
     'A message has been sent to your email address. ' => '@@Сообщение было отправлено на вашу электронную почту@@',
     'Awesome, almost there. ' => '@@Замечательно, почти готово!@@',
     'Class "{0}" does not exist' => '@@Класс "{0}" не найден@@',
+    'Disable Two-Factor Auth' => '@@Отключить двухфакторную авторизацию@@',
+    'Enable Two-factor auth' => '@@Включить двухфакторную авторизацию@@',
+    'Invalid two-factor code' => '@@Неверный код двухфакторной авторизации@@',
     'Registration ip' => '@@IP при регистрации@@',
     'Rule class can not be instantiated' => '@@Класс правила не может быть создан@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@Класс правила должен наследоваться от "yii\\rbac\\Rule"@@',
+    'This will disable two-factor auth. Are you sure?' => '@@Вы уверены, что хотите отключить двухфакторную авторизацию?@@',
+    'Two Factor Authentication' => '@@Двухфакторная авторизация@@',
+    'Two factor successfully enabled.' => '@@Включена двухфакторная авторизация.@@',
+    'Two-Factor Authentication' => '@@Двухфакторная авторизация@@',
+    'Two-factor auth protects you against stolen credentials' => '@@Двухфакторная авторизация предотвращает кражу ваших данных для входа.@@',
+    'Two-factor authentication code' => '@@Код двухфакторной авторизации@@',
+    'Two-factor authorization has been disabled.' => '@@Двухфакторная авторизация отключена.@@',
+    'Two-factor code' => '@@Код двухфакторной авторизации@@',
+    'Unable to disable two-factor authorization.' => '@@Не удалось отключить двухфакторную авторизацию.@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@Мы не можем повторно отправить письмо для подтверждения вашего адреса электронной почты.@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@Мы отправили письма на ваш старый и новый почтовые ящики. Вы должны перейти по обеим, чтобы завершить процесс смены адреса.@@',
     '(not set)' => '(не задано)',
     'A confirmation message has been sent to your new email address' => 'На указанный адрес было отправлено письмо с дальнейшими инструкциями',
+    'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'На вашу электронную почту было отправлено сообщение со ссылкой подтверждения регистрации.',
     'A new confirmation link has been sent' => 'Ссылка для подтверждения была отправлена вам на почту',
     'A password will be generated automatically if not provided' => 'Если Вы не укажете пароль, он будет сгенерирован автоматически',
     'Account' => 'Аккаунт',
@@ -81,6 +65,7 @@ return [
     'Are you sure you want to delete this user?' => 'Вы действительно хотите удалить этого пользователя?',
     'Are you sure you want to switch to this user for the rest of this Session?' => 'Вы уверены, что хотите переключиться на этого пользователя до окончании текущей сессии?',
     'Are you sure you want to unblock this user?' => 'Вы действительно хотите разблокировать этого пользователя?',
+    'Are you sure you wish to send a password recovery email to this user?' => 'Вы уверены, что хотите отправить письмо с восстановлением пароля на почту этому пользователю?',
     'Are you sure? Deleted user can not be restored' => 'Вы уверены? Удалённый аккаунт невозможно будет восстановить',
     'Are you sure? There is no going back' => 'Вы уверены? Это действие невозможно отменить',
     'Assignments' => 'Назначения',
@@ -93,13 +78,18 @@ return [
     'Authorization rule has been added.' => 'Правило авторизации добавлено.',
     'Authorization rule has been removed.' => 'Правило авторизации удалено.',
     'Authorization rule has been updated.' => 'Правило авторизации было обновлено.',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Замечательно, почти готово. Вам осталось перейти по ссылке подтверждения, отправленной на новый адрес вашей электронной почты.',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Замечательно, почти готово. Вам осталось перейти по ссылке подтверждения, отправленной на старый адрес вашей электронной почты.',
     'Bio' => 'О себе',
     'Block' => 'Блокировка',
     'Block status' => 'Статус блокировки',
     'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => 'Заблокирован {0, date, d MMMM YYYY в HH:mm}',
+    'Cancel' => 'Отменить',
+    'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'В вашем консольном приложении не настроен AuthManager, поэтому не удалось назначить роль "{0}".',
     'Change your avatar at Gravatar.com' => 'Изменить аватар на сайте Gravatar.com',
     'Children' => 'Дочерние элементы',
     'Class' => 'Класс',
+    'Close' => 'Закрыть',
     'Complete password reset on {0}' => 'Смена пароля на сайте {0}',
     'Confirm' => 'Подтвердить',
     'Confirm account on {0}' => 'Активация аккаунта на сайте {0}',
@@ -128,9 +118,12 @@ return [
     'Don\'t have an account? Sign up!' => 'Нет аккаунта? Зарегистрируйтесь!',
     'Email' => 'Email',
     'Email (public)' => 'Публичный email',
+    'Enable' => 'Включить',
     'Error occurred while changing password' => 'Произошла ошибка при смене пароля',
     'Error occurred while confirming user' => 'Произошла ошибка при активации пользователя',
     'Error occurred while deleting user' => 'Произошла ошибка при удалении пользователя',
+    'Error sending registration message to "{email}". Please try again later.' => 'Ошибка при отправке письма о регистрации на "{email}". Пожалуйста, попробуйте позже.',
+    'Error sending welcome message to "{email}". Please try again later.' => 'Ошибка при отправке приветственного письма на "{email}". Пожалуйста, попробуйте позже.',
     'Finish' => 'Завершить',
     'Forgot password?' => 'Забыли пароль?',
     'Gravatar email' => 'Email для Gravatar',
@@ -149,12 +142,14 @@ return [
     'It will be deleted forever' => 'Он будет удалён навсегда',
     'Items' => 'Элементы',
     'Joined on {0, date}' => 'Зарегистрирован {0, date}',
+    'Last login' => 'Последний вход',
     'Location' => 'Местоположение',
     'Login' => 'Логин',
     'Logout' => 'Выйти',
     'Manage users' => 'Управление пользователями',
     'Name' => 'Имя',
     'Networks' => 'Соцсети',
+    'Never' => 'Никогда',
     'New email' => 'Новый адрес электронной почты',
     'New password' => 'Новый пароль',
     'New permission' => 'Новое разрешение',
@@ -182,7 +177,10 @@ return [
     'Registration time' => 'Время регистрации',
     'Remember me next time' => 'Запомнить меня',
     'Request new confirmation message' => 'Запросить новое подтверждающее письмо',
+    'Required "key" cannot be empty.' => 'Поле "key" не может быть пустым.',
+    'Required "secret" cannot be empty.' => 'Поле "secret" не может быть пустым.',
     'Reset your password' => 'Сбросить пароль',
+    'Role "{0}" not found. Creating it.' => 'Роль "{0}" не найдена. Создаём её.',
     'Roles' => 'Роли',
     'Rule' => 'Правило',
     'Rule class must extend "yii\\rbac\\Rule".' => 'Класс с правилами должен наследовать "yii\\rbac\\Rule".',
@@ -192,13 +190,17 @@ return [
     'Rule {0} not found.' => 'Правило {0} не найдено.',
     'Rules' => 'Правила',
     'Save' => 'Сохранить',
+    'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Просканируйте QR-код приложением Google Authenticator App, затем вставьте временный код в поле и отправьте.',
+    'Send password recovery email' => 'Отправить письмо с восстановлением пароля',
     'Sign in' => 'Войти',
     'Sign up' => 'Зарегистрироваться',
     'Something went wrong' => 'Что-то пошло не так',
     'Switch identities is disabled.' => 'Переключение на другой аккаунт отключено.',
     'Thank you for signing up on {0}' => 'Спасибо за регистрацию на сайте {0}',
     'Thank you, registration is now complete.' => 'Поздравляем, регистрация успешно завершена!',
+    'The "recaptcha" component must be configured.' => 'Необходимо настроить компонент "recaptcha"',
     'The confirmation link is invalid or expired. Please try requesting a new one.' => 'Ссылка для активации аккаунта неправильна или устарела. Вы можете запросить новую.',
+    'The verification code is incorrect.' => 'Неправильный код подтверждения.',
     'There is neither role nor permission with name "{0}"' => 'Нет ни роли, ни разрешения с именем "{0}"',
     'This account has already been connected to another user' => 'Этот аккаунт уже привязан к другой учетной записи',
     'This email address has already been taken' => 'Email уже используется',
@@ -212,6 +214,7 @@ return [
     'Unable to delete user. Please, try again later.' => 'Не удалось удалить пользователя. Пожалуйста, попробуйте позже.',
     'Unable to remove authorization item.' => 'Не удалось удалить элемент авторизации.',
     'Unable to send confirmation link' => 'Не удалось отправить ссылку для активации аккаунта.',
+    'Unable to send recovery message to the user' => 'Не удалось отправить пользователю письмо восстановления',
     'Unable to update authorization item.' => 'Не удалось изменить элемент авторизации.',
     'Unable to update authorization rule.' => 'Не удалось изменить правило авторизации.',
     'Unable to update block status.' => 'Не удалось изменить статус блокировки.',
@@ -224,17 +227,23 @@ return [
     'Update rule' => 'Изменить правило',
     'Update user account' => 'Обновить аккаунт пользователя',
     'Updated at' => 'Дата редактирования',
+    'User account could not be created.' => 'Не удалось создать аккаунт для пользователя.',
     'User block status has been updated.' => 'Статус блокировки пользователя обновлён.',
+    'User could not be registered.' => 'Не удалось зарегистрировать пользователя.',
     'User has been confirmed' => 'Пользователь был активирован',
     'User has been created' => 'Пользователь был создан',
     'User has been deleted' => 'Пользователь был удалён',
     'User is not found' => 'Пользователь не найден',
+    'User not found.' => 'Пользователь не найден.',
     'Username' => 'Имя пользователя',
     'Users' => 'Пользователи',
     'VKontakte' => 'ВКонтакте',
+    'Verification failed. Please, enter new code.' => 'Проверка не удалась. Пожауйста, введите новый код',
+    'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Не удалось повторно отправить письмо для подтверждения вашего адреса электронной почты. Пожалуйста, проверьте, что ввели корректный адрес или что он ещё не был подтверждён.',
     'We have generated a password for you' => 'Мы сгенерировали новый пароль для вас',
     'We have received a request to change the email address for your account on {0}' => 'Мы получили запрос на смену адреса электронной почты для вашего аккаунта на {0}',
     'We have received a request to reset the password for your account on {0}' => 'Мы получили запрос на сброс пароля для вашего аккаунта на {0}',
+    'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Мы отправили письма на ваш старый и новый адреса. Вы должны перейти по обеим ссылкам, чтобы завершить процесс смены адреса.',
     'Website' => 'Веб-сайт',
     'Welcome to {0}' => 'Добро пожаловать на {0}',
     'Yandex' => 'Яндекс',
@@ -254,4 +263,5 @@ return [
     'Your email address has been changed' => 'Ваш email был успешно изменён',
     'Your profile has been updated' => 'Настройки профиля были успешно сохранены',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, d MMMM YYYY в HH:mm}',
+    '{0} cannot be blank.' => '{0} не может быть пустым.',
 ];
diff --git a/src/User/resources/i18n/th/usuario.php b/src/User/resources/i18n/th/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/th/usuario.php
+++ b/src/User/resources/i18n/th/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/tr_TR/usuario.php b/src/User/resources/i18n/tr_TR/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/tr_TR/usuario.php
+++ b/src/User/resources/i18n/tr_TR/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/uk/usuario.php b/src/User/resources/i18n/uk/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/uk/usuario.php
+++ b/src/User/resources/i18n/uk/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/vi/usuario.php b/src/User/resources/i18n/vi/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/vi/usuario.php
+++ b/src/User/resources/i18n/vi/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/zh-CN/usuario.php b/src/User/resources/i18n/zh-CN/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/zh-CN/usuario.php
+++ b/src/User/resources/i18n/zh-CN/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/views/settings/account.php b/src/User/resources/views/settings/account.php
index df29662..a62b4a7 100644
--- a/src/User/resources/views/settings/account.php
+++ b/src/User/resources/views/settings/account.php
@@ -81,7 +81,7 @@ $module = Yii::$app->getModule('user');
                             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                                     aria-hidden="true">&times;</span></button>
                             <h4 class="modal-title" id="myModalLabel">
-                                <?= Yii::t('usuario', 'Two Factor Authentication') ?></h4>
+                                <?= Yii::t('usuario', 'Two Factor Authentication (2FA)') ?></h4>
                         </div>
                         <div class="modal-body">
                             ...
@@ -96,25 +96,25 @@ $module = Yii::$app->getModule('user');
             </div>
             <div class="panel panel-info">
                 <div class="panel-heading">
-                    <h3 class="panel-title"><?= Yii::t('usuario', 'Two-Factor Authentication') ?></h3>
+                    <h3 class="panel-title"><?= Yii::t('usuario', 'Two Factor Authentication (2FA)') ?></h3>
                 </div>
                 <div class="panel-body">
                     <p>
-                        <?= Yii::t('usuario', 'Two-factor auth protects you against stolen credentials') ?>.
+                        <?= Yii::t('usuario', 'Two factor authentication protects you against stolen credentials') ?>.
                     </p>
                     <div class="text-right">
                         <?= Html::a(
-                            Yii::t('usuario', 'Disable Two-Factor Auth'),
+                            Yii::t('usuario', 'Disable two factor authentication'),
                             ['two-factor-disable', 'id' => $model->getUser()->id],
                             [
                                 'id' => 'disable_tf_btn',
                                 'class' => 'btn btn-warning ' . ($model->getUser()->auth_tf_enabled ? '' : 'hide'),
                                 'data-method' => 'post',
-                                'data-confirm' => Yii::t('usuario', 'This will disable two-factor auth. Are you sure?'),
+                                'data-confirm' => Yii::t('usuario', 'This will disable two factor authentication. Are you sure?'),
                             ]
                         ) ?>
                         <?= Html::a(
-                            Yii::t('usuario', 'Enable Two-factor auth'),
+                            Yii::t('usuario', 'Enable two factor authentication'),
                             '#tfmodal',
                             [
                                 'id' => 'enable_tf_btn',
diff --git a/src/User/resources/views/settings/two-factor.php b/src/User/resources/views/settings/two-factor.php
index d4d5527..6434396 100644
--- a/src/User/resources/views/settings/two-factor.php
+++ b/src/User/resources/views/settings/two-factor.php
@@ -29,7 +29,7 @@
 <div class="row">
     <div class="col-md-offset-3 col-md-6 text-center">
         <div class="input-group">
-            <input type="text" class="form-control" id="tfcode" placeholder="<?= Yii::t('usuario', 'Two-factor code') ?>"/>
+            <input type="text" class="form-control" id="tfcode" placeholder="<?= Yii::t('usuario', 'Two factor authentication code') ?>"/>
             <span class="input-group-btn">
                 <button type="button" class="btn btn-primary btn-submit-code">
                     <?= Yii::t('usuario', 'Enable') ?>