diff --git a/src/User/Model/User.php b/src/User/Model/User.php
index 3ee70c0..2adabd8 100644
--- a/src/User/Model/User.php
+++ b/src/User/Model/User.php
@@ -252,7 +252,7 @@ class User extends ActiveRecord implements IdentityInterface
             'twoFactorSecretLength' => ['auth_tf_key', 'string', 'max' => 16],
             'twoFactorEnabledNumber' => ['auth_tf_enabled', 'boolean'],
             'twoFactorTypeLength' => ['auth_tf_type', 'string', 'max' => 20],
-            'twoFactorTypeLength' => ['auth_tf_mobile_phone', 'string', 'max' => 20],
+            'twoFactorMobilePhoneLength' => ['auth_tf_mobile_phone', 'string', 'max' => 20],
         ];
     }
 
diff --git a/src/User/Validator/TwoFactorCodeValidator.php b/src/User/Validator/TwoFactorCodeValidator.php
index d90448c..2c02575 100644
--- a/src/User/Validator/TwoFactorCodeValidator.php
+++ b/src/User/Validator/TwoFactorCodeValidator.php
@@ -16,7 +16,7 @@ use Da\TwoFA\Manager;
 use Da\User\Contracts\ValidatorInterface;
 use Da\User\Model\User;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Service\TwoFactorEmailCodeGeneratorService;
+use Da\User\Service\TwoFactorQrCodeUriGeneratorService;
 use Yii;
 
 class TwoFactorCodeValidator implements ValidatorInterface
@@ -94,6 +94,6 @@ class TwoFactorCodeValidator implements ValidatorInterface
      */
     public function generateCode()
     {
-        return $this->make(TwoFactorEmailCodeGeneratorService::class,[$this->user])->run();
+        return $this->make(TwoFactorQrCodeUriGeneratorService::class,[$this->user])->run();
     }
 }
diff --git a/tests/_fixtures/data/user.php b/tests/_fixtures/data/user.php
index adb87e9..2f59661 100644
--- a/tests/_fixtures/data/user.php
+++ b/tests/_fixtures/data/user.php
@@ -81,6 +81,7 @@ return [
         'auth_key' => '39HU0m5lpjWtqstFVGFjj6lFb7UZDeRq',
         'auth_tf_key' => '',
         'auth_tf_enabled' => true,
+        'auth_tf_type' => 'google-authenticator',
         'created_at' => $time,
         'updated_at' => $time,
         'confirmed_at' => $time,