diff --git a/CHANGES.md b/CHANGES.md
index c400ab7..fa433ff 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -184,15 +184,12 @@
   - aauth_error_email_invalid => invalidEmail
   - aauth_error_password_invalid => invalidPassword
   - aauth_error_username_invalid => invalidUsername
-  - aauth_error_totp_code_invalid => invalidTOTPCode
-  - aauth_error_recaptcha_not_correct => invalidRecaptcha
   - aauth_error_vercode_invalid => invalidVercode
   - aauth_error_update_email_exists => existsAlreadyEmail
   - aauth_error_update_username_exists => existsAlreadyUsername
   - aauth_info_group_exists => existsAlreadyGroup
   - aauth_info_perm_exists => existsAlreadyPerm
-  - aauth_error_username_required => quiredUsername
-  - aauth_error_totp_code_required => quiredTOTPCode
+  - aauth_error_username_required => requiredUsername
   - aauth_error_no_user => notFoundUser
   - aauth_error_no_group => notFoundGroup
   - aauth_error_no_subgroup => notFoundSubgroup
@@ -200,6 +197,9 @@
   - aauth_info_already_subgroup => alreadyMemberSubgroup
 
 ### REMOVED
+  - aauth_error_totp_code_required
+  - aauth_error_totp_code_invalid
+  - aauth_error_recaptcha_not_correct
   - aauth_error_self_pm
   - aauth_error_no_pm
   - aauth_email_verification_code (merged with textVerification)
diff --git a/app/Language/de/Aauth.php b/app/Language/de/Aauth.php
index aa32161..a585506 100644
--- a/app/Language/de/Aauth.php
+++ b/app/Language/de/Aauth.php
@@ -52,12 +52,9 @@ return [
    'invalidEmail'           => 'Ungültige E-Mail-Adresse',
    'invalidPassword'        => 'Ungültiges Passwort',
    'invalidUsername'        => 'Ungültiger Benutzername',
-   'invalidTOTPCode'        => 'Ungültiger Bestätigungscode',
-   'invalidRecaptcha'       => 'Hupps, der eingegebene reCAPTCHA Text war falsch.',
    'invalidVerficationCode' => 'Ungültiger Überprüfungs-Code',
 
    'requiredUsername'       => 'Benutzername wird benötigt',
-   'requiredTOTPCode'       => 'Bestätigungscode wird benötigt',
    'requiredGroupName'      => 'Gruppen-Name wird benötigt',
    'requiredPermName'       => 'Berechtigungs-Regel-Name wird benötigt',
 
diff --git a/app/Language/en/Aauth.php b/app/Language/en/Aauth.php
index 81abdc9..50108bd 100644
--- a/app/Language/en/Aauth.php
+++ b/app/Language/en/Aauth.php
@@ -52,12 +52,9 @@ return [
    'invalidEmail'           => 'Invalid Email address',
    'invalidPassword'        => 'Invalid Password',
    'invalidUsername'        => 'Invalid Username',
-   'invalidTOTPCode'        => 'Invalid Authentication Code',
-   'invalidRecaptcha'       => 'Sorry, the reCAPTCHA text entered was incorrect.',
    'invalidVerficationCode' => 'Invalid Verification Code',
 
    'requiredUsername'       => 'Username required',
-   'requiredTOTPCode'       => 'Authentication Code required',
    'requiredGroupName'      => 'Group name required',
    'requiredPermName'       => 'Perm name required',
 
diff --git a/app/Language/es/Aauth.php b/app/Language/es/Aauth.php
index a81b906..ee8e495 100644
--- a/app/Language/es/Aauth.php
+++ b/app/Language/es/Aauth.php
@@ -52,12 +52,9 @@ return [
    'invalidEmail'           => 'Correo electrónico inválido',
    'invalidPassword'        => 'Contraseña invalida',
    'invalidUsername'        => 'Nombre de usuario invalido',
-   'invalidTOTPCode'        => 'Código TOTP obligatorio',
-   'invalidRecaptcha'       => 'Ups, El texto ingresado es incorrecto.',
    'invalidVerficationCode' => 'Código de verificación invalido',
 
    'requiredUsername'       => 'Nombre de usuario obligatorio',
-   'requiredTOTPCode'       => 'El código TOTP es obligatorio',
    'requiredGroupName'      => 'Group name required',
    'requiredPermName'       => 'Perm name required',
 
diff --git a/app/Language/fa/Aauth.php b/app/Language/fa/Aauth.php
index 1d48db9..5ade4c7 100644
--- a/app/Language/fa/Aauth.php
+++ b/app/Language/fa/Aauth.php
@@ -52,12 +52,9 @@ return [
    'invalidEmail'           => 'آدرس ایمیل نامعتبر است',
    'invalidPassword'        => 'کلمه عبور نامعتبر است',
    'invalidUsername'        => 'نام کاربری نامعتبر است',
-   'invalidTOTPCode'        => 'کد احراز هویت نامعتبر است',
-   'invalidRecaptcha'       => 'کد کپتچا به درستی وارد نشده.',
    'invalidVerficationCode' => 'Invalid Verification Code',
 
    'requiredUsername'       => 'ورود نام کاربری الزامی است',
-   'requiredTOTPCode'       => 'ورود کد احراز هویت الزامی است',
    'requiredGroupName'      => 'Group name required',
    'requiredPermName'       => 'Perm name required',
 
diff --git a/app/Language/fr/Aauth.php b/app/Language/fr/Aauth.php
index 39c10cc..8eec9e6 100644
--- a/app/Language/fr/Aauth.php
+++ b/app/Language/fr/Aauth.php
@@ -52,12 +52,9 @@ return [
    'invalidEmail'           => 'Adresse email invalide',
    'invalidPassword'        => 'Mot de passe invalide',
    'invalidUsername'        => 'Nom d\'utilisateur invalide',
-   'invalidTOTPCode'        => 'Code TOTP invalide',
-   'invalidRecaptcha'       => 'Désolé, le texte renseigné pour le reCAPTCHA est incorrect.',
    'invalidVerficationCode' => 'Invalid Verification Code',
 
    'requiredUsername'       => 'Nom d\'utilisateur requis',
-   'requiredTOTPCode'       => 'Code TOTP requis',
    'requiredGroupName'      => 'Group name required',
    'requiredPermName'       => 'Perm name required',
 
diff --git a/app/Language/id/Aauth.php b/app/Language/id/Aauth.php
index abb0f7b..0365c47 100644
--- a/app/Language/id/Aauth.php
+++ b/app/Language/id/Aauth.php
@@ -52,12 +52,9 @@ return [
    'invalidEmail'           => 'Alamat email tidak valid',
    'invalidPassword'        => 'kata sandi tidak valid',
    'invalidUsername'        => 'Username tidak valid',
-   'invalidTOTPCode'        => 'Kode autentikasi tidak valid',
-   'invalidRecaptcha'       => 'Maaf, teks reCAPTCHA yang anda dimasukkan salah.',
    'invalidVerficationCode' => 'Invalid Verification Code',
 
    'requiredUsername'       => 'Username tidak boleh kosong',
-   'requiredTOTPCode'       => 'Kode autentikasi tidak boleh kosong',
    'requiredGroupName'      => 'Group name required',
    'requiredPermName'       => 'Perm name required',
 
diff --git a/app/Language/ru/Aauth.php b/app/Language/ru/Aauth.php
index 4347542..b8d2332 100644
--- a/app/Language/ru/Aauth.php
+++ b/app/Language/ru/Aauth.php
@@ -52,12 +52,9 @@ return [
    'invalidEmail'           => 'Некорректный адрес e-mail',
    'invalidPassword'        => 'Некорректный пароль',
    'invalidUsername'        => 'Некорректное имя пользователя',
-   'invalidTOTPCode'        => 'Неверный код аутентификации',
-   'invalidRecaptcha'       => 'Извините, текст с reCAPTCHA введен неверно.',
    'invalidVerficationCode' => 'Invalid Verification Code',
 
    'requiredUsername'       => 'Логин обязателен',
-   'requiredTOTPCode'       => 'Требуется код аутентификации',
    'requiredGroupName'      => 'Group name required',
    'requiredPermName'       => 'Perm name required',
 
diff --git a/app/Language/sv/Aauth.php b/app/Language/sv/Aauth.php
index 3b2cbb3..57501ab 100644
--- a/app/Language/sv/Aauth.php
+++ b/app/Language/sv/Aauth.php
@@ -52,12 +52,9 @@ return [
    'invalidEmail'           => 'Ogiltig e-postadress',
    'invalidPassword'        => 'Ogiltigt lösenord',
    'invalidUsername'        => 'Ogiltigt användarnamn',
-   'invalidTOTPCode'        => 'Ogiltig bekräftelsekod',
-   'invalidRecaptcha'       => 'Tyvärr, reCAPTCHA-texten var felaktig.',
    'invalidVerficationCode' => 'Invalid Verification Code',
 
    'requiredUsername'       => 'Användarnamn obligatoriskt',
-   'requiredTOTPCode'       => 'Bekräftelsekod behövs',
    'requiredGroupName'      => 'Group name required',
    'requiredPermName'       => 'Perm name required',
 
diff --git a/app/Language/zh-CN/Aauth.php b/app/Language/zh-CN/Aauth.php
index 46f28fa..55b7a7b 100644
--- a/app/Language/zh-CN/Aauth.php
+++ b/app/Language/zh-CN/Aauth.php
@@ -54,12 +54,9 @@ return [
    'invalidEmail'           => '无效的电子邮件地址',
    'invalidPassword'        => '无效的密码',
    'invalidUsername'        => '无效的用户名',
-   'invalidTOTPCode'        => '无效的证认码',
-   'invalidRecaptcha'       => '对不起，reCAPTCHA 验证码输入错误。',
    'invalidVerficationCode' => 'Invalid Verification Code',
 
    'requiredUsername'       => 'Username required',
-   'requiredTOTPCode'       => '需要证认码',
    'requiredGroupName'      => 'Group name required',
    'requiredPermName'       => 'Perm name required',
 
diff --git a/app/Language/zh-TW/Aauth.php b/app/Language/zh-TW/Aauth.php
index edc91aa..2e40562 100644
--- a/app/Language/zh-TW/Aauth.php
+++ b/app/Language/zh-TW/Aauth.php
@@ -54,12 +54,9 @@ return [
    'invalidEmail'           => '無效的電子郵件地址',
    'invalidPassword'        => '無效的密碼',
    'invalidUsername'        => '無效的用戶名',
-   'invalidTOTPCode'        => '無效的證認碼',
-   'invalidRecaptcha'       => '對不起，reCAPTCHA 驗證碼輸入錯誤。',
    'invalidVerficationCode' => 'Invalid Verification Code',
 
    'requiredUsername'       => '需要用戶名',
-   'requiredTOTPCode'       => '需要證認碼',
    'requiredGroupName'      => 'Group name required',
    'requiredPermName'       => 'Perm name required',