diff --git a/flutter/lib/common/widgets/dialog.dart b/flutter/lib/common/widgets/dialog.dart
index 21dcb9333..78487eb86 100644
--- a/flutter/lib/common/widgets/dialog.dart
+++ b/flutter/lib/common/widgets/dialog.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -429,7 +428,6 @@ class Dialog2FaField extends ValidationField {
     this.autoFocus = true,
     this.reRequestFocus = false,
     this.title,
-    this.helperText,
     this.hintText,
     this.errorText,
     this.readyCallback,
@@ -440,7 +438,6 @@ class Dialog2FaField extends ValidationField {
   final bool autoFocus;
   final bool reRequestFocus;
   final String? title;
-  final String? helperText;
   final String? hintText;
   final String? errorText;
   final VoidCallback? readyCallback;
@@ -457,7 +454,6 @@ class Dialog2FaField extends ValidationField {
       reRequestFocus: reRequestFocus,
       hintText: hintText,
       readyCallback: readyCallback,
-      helperText: helperText ?? translate('2fa_tip'),
       onChanged: _onChanged,
       keyboardType: TextInputType.number,
       inputFormatters: [
@@ -1860,6 +1856,8 @@ void enter2FaDialog(
                 'OK',
                 onPressed: submitReady.isTrue ? submit : null,
               )),
-        ]);
+        ],
+        onSubmit: submit,
+        onCancel: cancel);
   });
 }
diff --git a/src/lang/ar.rs b/src/lang/ar.rs
index c32ab5648..cd57ef865 100644
--- a/src/lang/ar.rs
+++ b/src/lang/ar.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/ca.rs b/src/lang/ca.rs
index 8cf0b3839..246825d18 100644
--- a/src/lang/ca.rs
+++ b/src/lang/ca.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/cn.rs b/src/lang/cn.rs
index e7a8e2b0f..7103de5bd 100644
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "交换Control键和Command键"),
         ("swap-left-right-mouse", "交换鼠标左右键"),
         ("2FA code", "双重认证代码"),
-        ("2fa_tip", "请输入授权 app 中的双重认证代码"),
         ("More", "更多"),
         ("enable-2fa-title", "启用双重认证"),
         ("enable-2fa-desc", "现在请设置身份验证器。您可以在手机或台式电脑上使用 Authy、Microsoft 或 Google Authenticator 等验证器。用验证器扫描二维码，然后输入显示的验证码以启用双重认证。"),
diff --git a/src/lang/cs.rs b/src/lang/cs.rs
index 447284bec..ba504800c 100644
--- a/src/lang/cs.rs
+++ b/src/lang/cs.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Prohození klávesy control-command"),
         ("swap-left-right-mouse", "Prohodit levé a pravé tlačítko myši"),
         ("2FA code", "2FA kód"),
-        ("2fa_tip", "Zadejte svůj kód 2FA do ověřovací aplikace."),
         ("More", "Více"),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/da.rs b/src/lang/da.rs
index a925bcc39..52f423b24 100644
--- a/src/lang/da.rs
+++ b/src/lang/da.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/de.rs b/src/lang/de.rs
index e6a70b75e..580b1f01c 100644
--- a/src/lang/de.rs
+++ b/src/lang/de.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Steuerungs- und Befehlstasten tauschen"),
         ("swap-left-right-mouse", "Linke und rechte Maustaste tauschen"),
         ("2FA code", "2FA-Code"),
-        ("2fa_tip", "Bitte geben Sie Ihren 2FA-Code in der Authentifizierungs-App ein."),
         ("More", "Mehr"),
         ("enable-2fa-title", "Zwei-Faktor-Authentifizierung aktivieren"),
         ("enable-2fa-desc", "Bitte richten Sie jetzt Ihren Authentifikator ein. Sie können eine Authentifizierungs-App wie Authy, Microsoft oder Google Authenticator auf Ihrem Telefon oder Desktop verwenden.\n\nScannen Sie den QR-Code mit Ihrer App und geben Sie den Code ein, den Ihre App anzeigt, um die Zwei-Faktor-Authentifizierung zu aktivieren."),
diff --git a/src/lang/el.rs b/src/lang/el.rs
index 093e3ac25..7070eb2aa 100644
--- a/src/lang/el.rs
+++ b/src/lang/el.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Εναλλαγή κουμπιών control-command"),
         ("swap-left-right-mouse", "Εναλλαγή αριστερό-δεξί κουμπί του ποντικιού"),
         ("2FA code", "κωδικός 2FA"),
-        ("2fa_tip", "Παρακαλώ εισάγεται τον κωδικό 2FA στην εφαρμογή πιστοποίησης"),
         ("More", "Περισσότερα"),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/en.rs b/src/lang/en.rs
index cc382e7f7..5e091d137 100644
--- a/src/lang/en.rs
+++ b/src/lang/en.rs
@@ -211,7 +211,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("capture_display_elevated_connections_tip", "Capturing multiple displays is not supported in the elevated user mode. Please try again after installation if you want to control multiple displays."),
         ("swap-left-right-mouse", "Swap left-right mouse button"),
         ("2FA code", "2FA code"),
-        ("2fa_tip", "Please enter your 2FA code in the authentication app."),
         ("enable-2fa-title", "Enable two-factor authentication"),
         ("enable-2fa-desc", "Please set up your authenticator now. You can use an authenticator app such as Authy, Microsoft or Google Authenticator on your phone or desktop.\n\nScan the QR code with your app and enter the code that your app shows to enable two-factor authentication."),
         ("wrong-2fa-code", "Can't verify the code. Check that code and local time settings are correct"),
diff --git a/src/lang/eo.rs b/src/lang/eo.rs
index 2d1980ffd..ba73d48bd 100644
--- a/src/lang/eo.rs
+++ b/src/lang/eo.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/es.rs b/src/lang/es.rs
index fad514506..61777b64f 100644
--- a/src/lang/es.rs
+++ b/src/lang/es.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Intercambiar teclas control-comando"),
         ("swap-left-right-mouse", "Intercambiar botones derecho-izquierdo del ratón"),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/et.rs b/src/lang/et.rs
index 5614da975..651189aa6 100644
--- a/src/lang/et.rs
+++ b/src/lang/et.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", "Vaheta vasak ja parem hiirenupp"),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/fa.rs b/src/lang/fa.rs
index df8d1a222..df2c6e114 100644
--- a/src/lang/fa.rs
+++ b/src/lang/fa.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "گرفتن چندین نمایشگر در حالت کاربر زیاد پشتیبانی نمی شود. اگر می‌خواهید چند نمایشگر را کنترل کنید، لطفاً پس از نصب دوباره امتحان کنید."),
         ("swap-left-right-mouse", "دکمه چپ و راست ماوس را عوض کنید"),
         ("2FA code", "کد ورود 2 مرحله ای"),
-        ("2fa_tip", "لطفا کد ورود 2 مرحله ای خود را در برنامه احراز هویت وارد کنید"),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/fr.rs b/src/lang/fr.rs
index 60f9eb989..3dcc4d411 100644
--- a/src/lang/fr.rs
+++ b/src/lang/fr.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Échanger la touche de controle-commande"),
         ("swap-left-right-mouse", "Intervertir le bouton gauche et droit de la souris"),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/hu.rs b/src/lang/hu.rs
index c3b1ebd04..623ab273f 100644
--- a/src/lang/hu.rs
+++ b/src/lang/hu.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/id.rs b/src/lang/id.rs
index bb2ccecc2..31e1018e2 100644
--- a/src/lang/id.rs
+++ b/src/lang/id.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/it.rs b/src/lang/it.rs
index c3a272bd0..5fe9808c2 100644
--- a/src/lang/it.rs
+++ b/src/lang/it.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Scambia tasto controllo-comando"),
         ("swap-left-right-mouse", "Scambia pulsante sinistro-destro mouse"),
         ("2FA code", "Codice 2FA"),
-        ("2fa_tip", "Inserisci il codice 2FA nell'app di autenticazione."),
         ("More", "Altro"),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/ja.rs b/src/lang/ja.rs
index 96ac8c417..f2328a8b2 100644
--- a/src/lang/ja.rs
+++ b/src/lang/ja.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/ko.rs b/src/lang/ko.rs
index e5aefadef..b8174a44c 100644
--- a/src/lang/ko.rs
+++ b/src/lang/ko.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/kz.rs b/src/lang/kz.rs
index 96205d401..61f3ba5ee 100644
--- a/src/lang/kz.rs
+++ b/src/lang/kz.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/lt.rs b/src/lang/lt.rs
index 1bec420e3..7588830f8 100644
--- a/src/lang/lt.rs
+++ b/src/lang/lt.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/lv.rs b/src/lang/lv.rs
index 81aea41b8..e2177b964 100644
--- a/src/lang/lv.rs
+++ b/src/lang/lv.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Apmainīt vadības un komandas taustiņu"),
         ("swap-left-right-mouse", "Apmainīt kreiso un labo peles pogu"),
         ("2FA code", "2FA kods"),
-        ("2fa_tip", "Lūdzu, ievadiet savu 2FA kodu autentifikācijas lietotnē."),
         ("More", "Vairāk"),
         ("enable-2fa-title", "Iespējot divu faktoru autentifikāciju"),
         ("enable-2fa-desc", "Lūdzu, iestatiet savu autentifikatoru tūlīt. Tālrunī vai darbvirsmā varat izmantot autentifikācijas lietotni, piemēram, Authy, Microsoft vai Google Authenticator.\n\nIzmantojot lietotni, skenējiet QR kodu un ievadiet lietotnē parādīto kodu, lai iespējotu divu faktoru autentifikāciju."),
diff --git a/src/lang/nb.rs b/src/lang/nb.rs
index 7be99f637..6c091665b 100644
--- a/src/lang/nb.rs
+++ b/src/lang/nb.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/nl.rs b/src/lang/nl.rs
index 4f7495a5a..10b57c38d 100644
--- a/src/lang/nl.rs
+++ b/src/lang/nl.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Wissel controle-commando toets"),
         ("swap-left-right-mouse", "wissel-links-rechts-muis"),
         ("2FA code", "2FA-code"),
-        ("2fa_tip", "Geef je 2FA-code op in de verificatie-app."),
         ("More", "Meer"),
         ("enable-2fa-title", "activeer-2fa-titel"),
         ("enable-2fa-desc", "activeer-2fa-desc"),
diff --git a/src/lang/pl.rs b/src/lang/pl.rs
index 8f77d1039..a9c2eafdc 100644
--- a/src/lang/pl.rs
+++ b/src/lang/pl.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Zamiana przycisków sterujących myszki"),
         ("swap-left-right-mouse", "Zamień przyciski myszki (lewy - prawy)"),
         ("2FA code", "Kod 2FA"),
-        ("2fa_tip", "Proszę wprowadzić swój kod 2FA w aplikacji do autoryzacji."),
         ("More", "Więcej"),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs
index 6d753ffd1..d3775aef7 100644
--- a/src/lang/pt_PT.rs
+++ b/src/lang/pt_PT.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs
index caead766c..e52612bc1 100644
--- a/src/lang/ptbr.rs
+++ b/src/lang/ptbr.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/ro.rs b/src/lang/ro.rs
index 52b7e45f6..a7cf40490 100644
--- a/src/lang/ro.rs
+++ b/src/lang/ro.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/ru.rs b/src/lang/ru.rs
index eb349a818..3048e0304 100644
--- a/src/lang/ru.rs
+++ b/src/lang/ru.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Поменять кнопки управления и команд"),
         ("swap-left-right-mouse", "Поменять левую и правую кнопки мыши"),
         ("2FA code", "Код 2FA"),
-        ("2fa_tip", "Введите код двухфакторной аутентификации из приложения для аутентификации."),
         ("More", "Ещё"),
         ("enable-2fa-title", "Использовать двухфакторную аутентификацию"),
         ("enable-2fa-desc", "Настройте приложение аутентификации. Используйте, например, Authy, Microsoft или Google Authenticator, на телефоне или компьютере.\n\nОтсканируйте QR-код с помощью приложения аутентификации и введите код, который отобразит это приложение, чтобы включить двухфакторную аутентификацию."),
diff --git a/src/lang/sk.rs b/src/lang/sk.rs
index 6cf4cda6e..d1cca6772 100644
--- a/src/lang/sk.rs
+++ b/src/lang/sk.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Vymeniť kláves ovládania a príkazu"),
         ("swap-left-right-mouse", "Prehodiť ľavé a pravé tlačidlo myši"),
         ("2FA code", "2FA kód"),
-        ("2fa_tip", "Zadajte svoj kód 2FA do aplikácie na overovanie."),
         ("More", "Viac"),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/sl.rs b/src/lang/sl.rs
index c5295637e..c29a8884e 100755
--- a/src/lang/sl.rs
+++ b/src/lang/sl.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/sq.rs b/src/lang/sq.rs
index 480bf5510..34d45fe26 100644
--- a/src/lang/sq.rs
+++ b/src/lang/sq.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/sr.rs b/src/lang/sr.rs
index f50ddd0a6..80712b544 100644
--- a/src/lang/sr.rs
+++ b/src/lang/sr.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/sv.rs b/src/lang/sv.rs
index e30d2ed3b..33340d423 100644
--- a/src/lang/sv.rs
+++ b/src/lang/sv.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/template.rs b/src/lang/template.rs
index eb5855e82..762f98ec7 100644
--- a/src/lang/template.rs
+++ b/src/lang/template.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/th.rs b/src/lang/th.rs
index 59723a266..547fb096a 100644
--- a/src/lang/th.rs
+++ b/src/lang/th.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/tr.rs b/src/lang/tr.rs
index 0a57843f4..a6fd869d8 100644
--- a/src/lang/tr.rs
+++ b/src/lang/tr.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/tw.rs b/src/lang/tw.rs
index 5a84be551..aa34a1c7f 100644
--- a/src/lang/tw.rs
+++ b/src/lang/tw.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/ua.rs b/src/lang/ua.rs
index 7f46929dd..3755207cb 100644
--- a/src/lang/ua.rs
+++ b/src/lang/ua.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", "Поміняти місцями клавіші Control та Command"),
         ("swap-left-right-mouse", "Поміняти місцями ліву та праву кнопки миші"),
         ("2FA code", "Код двофакторної автентифікації"),
-        ("2fa_tip", "Будь ласка, введіть код двофакторної автентифікації в застосунку для автентифікації."),
         ("More", "Більше"),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/lang/vn.rs b/src/lang/vn.rs
index d2eb11a3d..c6e71d2e7 100644
--- a/src/lang/vn.rs
+++ b/src/lang/vn.rs
@@ -579,7 +579,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Swap control-command key", ""),
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
-        ("2fa_tip", ""),
         ("More", ""),
         ("enable-2fa-title", ""),
         ("enable-2fa-desc", ""),
diff --git a/src/ui/index.tis b/src/ui/index.tis
index b6d80fa04..e1f487a15 100644
--- a/src/ui/index.tis
+++ b/src/ui/index.tis
@@ -1249,7 +1249,7 @@ function on_2fa_check(last_msg) {
     msgbox("custom-2fa-verification-code", translate('Verification code'), <div .form .set-password> 
             { isEmailCheck && <div><span>{translate('Email')}:</span><span>{emailHint}</span></div> }
             <div><span>{translate(isEmailCheck ? 'Verification code' : '2FA code')}:</span><input|text name="verification_code" .outline-focus /></div> 
-            <div style="font-size:0.9em; margin-bottom:1em;">{translate(isEmailCheck ? 'verification_tip' : '2fa_tip')}</div>
+            { isEmailCheck && <div style="font-size:0.9em; margin-bottom:1em;">{translate('verification_tip')}</div> }
         </div>, "", 
         function(res=null, show_progress) {
             if (!res) return;