diff --git a/app/containers/TwoFactor/index.tsx b/app/containers/TwoFactor/index.tsx
index 376f1fc98a..08fe503591 100644
--- a/app/containers/TwoFactor/index.tsx
+++ b/app/containers/TwoFactor/index.tsx
@@ -4,18 +4,19 @@ import isEmpty from 'lodash/isEmpty';
 import { sha256 } from 'js-sha256';
 import Modal from 'react-native-modal';
 import useDeepCompareEffect from 'use-deep-compare-effect';
-import { connect } from 'react-redux';
 
 import { FormTextInput } from '../TextInput';
 import I18n from '../../i18n';
 import EventEmitter from '../../lib/methods/helpers/events';
 import { useTheme } from '../../theme';
-import { themes } from '../../lib/constants';
 import Button from '../Button';
 import sharedStyles from '../../views/Styles';
 import styles from './styles';
-import { IApplicationState } from '../../definitions';
+import { ICredentials } from '../../definitions';
 import { Services } from '../../lib/services';
+import { useAppSelector } from '../../lib/hooks';
+import Toast from '../Toast';
+import { showToast } from '../../lib/methods/helpers/showToast';
 
 export const TWO_FACTOR = 'TWO_FACTOR';
 
@@ -32,6 +33,7 @@ interface IMethods {
 }
 
 interface EventListenerMethod {
+	params?: ICredentials;
 	method?: keyof IMethods;
 	submit?: (param: string) => void;
 	cancel?: () => void;
@@ -55,15 +57,31 @@ const methods: IMethods = {
 	}
 };
 
-const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) => {
-	const { theme } = useTheme();
+const TwoFactor = React.memo(() => {
+	const { colors } = useTheme();
+	const { isMasterDetail } = useAppSelector(state => ({
+		isMasterDetail: state.app.isMasterDetail as boolean
+	}));
 	const [visible, setVisible] = useState(false);
 	const [data, setData] = useState<EventListenerMethod>({});
 	const [code, setCode] = useState<string>('');
 
 	const method = data.method ? methods[data.method] : null;
 	const isEmail = data.method === 'email';
-	const sendEmail = () => Services.sendEmailCode();
+	const params = data?.params;
+
+	const sendEmail = async () => {
+		try {
+			if (params?.user) {
+				const response = await Services.sendEmailCode(params?.user);
+				if (response.success) {
+					showToast(I18n.t('Two_Factor_Success_message'));
+				}
+			}
+		} catch (error) {
+			console.log(error, 'here');
+		}
+	};
 
 	useDeepCompareEffect(() => {
 		if (!isEmpty(data)) {
@@ -102,7 +120,7 @@ const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) =
 		setData({});
 	};
 
-	const color = themes[theme].fontTitlesLabels;
+	const color = colors.fontTitlesLabels;
 	return (
 		<Modal avoidKeyboard useNativeDriver isVisible={visible} hideModalContentWhileAnimating>
 			<View style={styles.container} testID='two-factor'>
@@ -110,7 +128,7 @@ const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) =
 					style={[
 						styles.content,
 						isMasterDetail && [sharedStyles.modalFormSheet, styles.tablet],
-						{ backgroundColor: themes[theme].surfaceTint }
+						{ backgroundColor: colors.surfaceTint }
 					]}>
 					<Text style={[styles.title, { color }]}>{I18n.t(method?.title || 'Two_Factor_Authentication')}</Text>
 					{method?.text ? <Text style={[styles.subtitle, { color }]}>{I18n.t(method.text)}</Text> : null}
@@ -136,13 +154,10 @@ const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) =
 						<Button title={I18n.t('Verify')} type='primary' style={styles.button} onPress={onSubmit} testID='two-factor-send' />
 					</View>
 				</View>
+				<Toast />
 			</View>
 		</Modal>
 	);
 });
 
-const mapStateToProps = (state: IApplicationState) => ({
-	isMasterDetail: state.app.isMasterDetail
-});
-
-export default connect(mapStateToProps)(TwoFactor);
+export default TwoFactor;
diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json
index 3625b984c5..a1a73b0065 100644
--- a/app/i18n/locales/ar.json
+++ b/app/i18n/locales/ar.json
@@ -446,6 +446,7 @@
   "Translate": "ترجمة",
   "Try_again": "حاول مجدداً",
   "Two_Factor_Authentication": "المصادقة الثنائية",
+  "Two_Factor_Success_message": "تم إرسال رمز التحقق الثنائي العوامل! يرجى التحقق من بريدك الإلكتروني.",
   "Type_message": "اكتب رسالة",
   "UNARCHIVE": "إلغاء الأرشفة",
   "unarchive": "إلغاء الأرشفة",
diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json
index b815c02902..fa830f13cb 100644
--- a/app/i18n/locales/bn-IN.json
+++ b/app/i18n/locales/bn-IN.json
@@ -674,6 +674,7 @@
   "Translate": "অনুবাদ করুন",
   "Try_again": "আবার চেষ্টা করুন",
   "Two_Factor_Authentication": "দুটি ধারণামূলক প্রমাণীকরণ",
+  "Two_Factor_Success_message": "দুই-স্তরের প্রমাণীকরণ কোড পাঠানো হয়েছে! অনুগ্রহ করে আপনার ইমেইল চেক করুন।",
   "Type_message": "বার্তা লিখুন",
   "Types": "ধরণ",
   "UNARCHIVE": "আনআরকাইভ",
diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json
index ab35fc5b75..35072e231d 100644
--- a/app/i18n/locales/cs.json
+++ b/app/i18n/locales/cs.json
@@ -741,6 +741,7 @@
   "Troubleshooting": "Odstraňování problémů",
   "Try_again": "Zkusit to znovu",
   "Two_Factor_Authentication": "Dvoufaktorové ověřování",
+  "Two_Factor_Success_message": "Byl odeslán dvoufaktorový autentizační kód! Zkontrolujte svůj e-mail.",
   "Type_message": "Zadejte zprávu",
   "Types": "Typy",
   "UNARCHIVE": "UNARCHIVOVAT",
diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json
index d943e376fc..14ca44466a 100644
--- a/app/i18n/locales/de.json
+++ b/app/i18n/locales/de.json
@@ -667,6 +667,7 @@
   "Translate": "Übersetzen",
   "Try_again": "Versuchen Sie es nochmal",
   "Two_Factor_Authentication": "Zwei-Faktor-Authentifizierung",
+  "Two_Factor_Success_message": "Zwei-Faktor-Authentifizierungscode gesendet! Bitte überprüfen Sie Ihre E-Mail.",
   "Type_message": "Nachricht schreiben",
   "Types": "Typen",
   "UNARCHIVE": "WIEDERHERSTELLEN",
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index efde9034a4..5714de7813 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -769,6 +769,7 @@
   "Troubleshooting": "Troubleshooting",
   "Try_again": "Try again",
   "Two_Factor_Authentication": "Two-factor authentication",
+  "Two_Factor_Success_message": "Two-factor authentication code sent! Please check your email.",
   "Type_message": "Type message",
   "Types": "Types",
   "UNARCHIVE": "UNARCHIVE",
diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json
index 21e22c35df..e308d454d3 100644
--- a/app/i18n/locales/es.json
+++ b/app/i18n/locales/es.json
@@ -276,6 +276,7 @@
   "Translate": "Traducir",
   "Try_again": "Intentar de nuevo",
   "Two_Factor_Authentication": "Autenticación de doble factor",
+  "Two_Factor_Success_message": "¡Código de autenticación de dos factores enviado! Por favor, revisa tu correo electrónico.",
   "Type_message": "Escribir mensaje",
   "UNARCHIVE": "DESARCHIVAR",
   "unarchive": "desarchivar",
diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json
index 52deeacab2..3dd05e43fd 100644
--- a/app/i18n/locales/fi.json
+++ b/app/i18n/locales/fi.json
@@ -642,6 +642,7 @@
   "Translate": "Käännä",
   "Try_again": "Yritä uudelleen",
   "Two_Factor_Authentication": "Kaksivaiheinen tunnistautuminen",
+  "Two_Factor_Success_message": "Kaksivaiheinen todennuskoodi lähetetty! Tarkista sähköpostisi.",
   "Type_message": "Kirjoita viesti",
   "Types": "Tyypit",
   "UNARCHIVE": "PALAUTA ARKISTOSTA",
diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json
index 4f082a34a7..84dcd18fb9 100644
--- a/app/i18n/locales/fr.json
+++ b/app/i18n/locales/fr.json
@@ -571,6 +571,7 @@
   "Translate": "Traduire",
   "Try_again": "Réessayer",
   "Two_Factor_Authentication": "Authentification à deux facteurs",
+  "Two_Factor_Success_message": "Code d'authentification à deux facteurs envoyé ! Veuillez vérifier votre e-mail.",
   "Type_message": "Tapez le message",
   "Types": "Types",
   "UNARCHIVE": "DÉSARCHIVER",
diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json
index d7b53902fc..8651cb5eb9 100644
--- a/app/i18n/locales/hi-IN.json
+++ b/app/i18n/locales/hi-IN.json
@@ -674,6 +674,7 @@
   "Translate": "अनुवाद करें",
   "Try_again": "फिर कोशिश करें",
   "Two_Factor_Authentication": "दो-क्रमिक प्रमाणीकरण",
+  "Two_Factor_Success_message": "दो-कारक प्रमाणीकरण कोड भेजा गया! कृपया अपना ईमेल चेक करें।",
   "Type_message": "संदेश टाइप करें",
   "Types": "प्रकार",
   "UNARCHIVE": "अनारकाइव करें",
diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json
index 8d609082c7..947cee0b15 100644
--- a/app/i18n/locales/hu.json
+++ b/app/i18n/locales/hu.json
@@ -676,6 +676,7 @@
   "Translate": "Fordítás",
   "Try_again": "Próbálja újra",
   "Two_Factor_Authentication": "Kétfaktoros hitelesítés",
+  "Two_Factor_Success_message": "Kétfaktoros hitelesítési kód elküldve! Kérjük, ellenőrizze az emailjét.",
   "Type_message": "Üzenet típusa",
   "Types": "Típusok",
   "UNARCHIVE": "ARCHIVÁLÁS MEGSZÜNTETÉS",
diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json
index 0475af172a..d332e1d9d2 100644
--- a/app/i18n/locales/it.json
+++ b/app/i18n/locales/it.json
@@ -483,6 +483,7 @@
   "Translate": "Traduci",
   "Try_again": "Riprova",
   "Two_Factor_Authentication": "Autenticazione a due fattori",
+  "Two_Factor_Success_message": "Codice di autenticazione a due fattori inviato! Si prega di controllare la tua email.",
   "Type_message": "Scrivi messaggio",
   "UNARCHIVE": "RIMUOVI DALL'ARCHIVIO",
   "unarchive": "rimuovi dall'archivio",
diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json
index bf76b2f58d..681a5047a3 100644
--- a/app/i18n/locales/ja.json
+++ b/app/i18n/locales/ja.json
@@ -376,6 +376,7 @@
   "Translate": "翻訳",
   "Try_again": "再度お試しください。",
   "Two_Factor_Authentication": "２段階認証",
+  "Two_Factor_Success_message": "二要素認証コードが送信されました！メールを確認してください。",
   "Type_message": "メッセージを入力",
   "UNARCHIVE": "アーカイブ解除",
   "unarchive": "アーカイブ解除",
diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json
index 09f540609b..c32a604afa 100644
--- a/app/i18n/locales/nl.json
+++ b/app/i18n/locales/nl.json
@@ -571,6 +571,7 @@
   "Translate": "Vertalen",
   "Try_again": "Probeer het opnieuw",
   "Two_Factor_Authentication": "Twee-factor authenticatie",
+  "Two_Factor_Success_message": "Twee-factor authenticatiecode verzonden! Controleer uw e-mail.",
   "Type_message": "Typ bericht",
   "Types": "Soorten",
   "UNARCHIVE": "DEARCHIVEREN",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index 5c92d52def..a5868a0715 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -748,6 +748,7 @@
   "Translate": "Traduzir",
   "Try_again": "Tentar novamente",
   "Two_Factor_Authentication": "Autenticação de dois fatores",
+  "Two_Factor_Success_message": "Código de autenticação de dois fatores enviado! Por favor, verifique seu e-mail.",
   "Type_message": "Digitar mensagem",
   "Types": "Tipos",
   "UNARCHIVE": "DESARQUIVAR",
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index af4b18986c..47ff5395e8 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -356,6 +356,7 @@
   "topic": "tópico",
   "Try_again": "Tente novamente",
   "Two_Factor_Authentication": "Autenticação 2FA",
+  "Two_Factor_Success_message": "Código de autenticação de dois fatores enviado! Por favor, verifique o seu email.",
   "UNARCHIVE": "DESARQUIVAR",
   "unarchive": "desarquivar",
   "Unmute": "Retirar silêncio",
diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json
index 5cafea805d..b6133c7953 100644
--- a/app/i18n/locales/ru.json
+++ b/app/i18n/locales/ru.json
@@ -619,6 +619,7 @@
   "Translate": "Перевести",
   "Try_again": "Попробуйте еще раз",
   "Two_Factor_Authentication": "Двухфакторная аутентификация",
+  "Two_Factor_Success_message": "Код двухфакторной аутентификации отправлен! Пожалуйста, проверьте вашу электронную почту.",
   "Type_message": "Написать сообщение",
   "Types": "Типы",
   "UNARCHIVE": "РАЗАРХИВИРОВАТЬ",
diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json
index 3757ed108a..399e45e783 100644
--- a/app/i18n/locales/sl-SI.json
+++ b/app/i18n/locales/sl-SI.json
@@ -586,6 +586,7 @@
   "Translate": "Prevesti",
   "Try_again": "Poskusi ponovno",
   "Two_Factor_Authentication": "Dvofaktorska overjanje",
+  "Two_Factor_Success_message": "Dvofaktorska avtentikacijska koda poslana! Prosimo, preverite svoj e-poštni naslov.",
   "Type_message": "Tip sporočila",
   "Types": "Vrste",
   "UNARCHIVE": "ODPAKIRATI",
diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json
index 0291ed1409..2ec4479665 100644
--- a/app/i18n/locales/sv.json
+++ b/app/i18n/locales/sv.json
@@ -641,6 +641,7 @@
   "Translate": "Översätt",
   "Try_again": "Försök igen",
   "Two_Factor_Authentication": "Tvåfaktorsautentisering",
+  "Two_Factor_Success_message": "Tvåfaktorsautentiseringskod skickad! Vänligen kontrollera din e-post.",
   "Type_message": "Skriv meddelande",
   "Types": "Typer",
   "UNARCHIVE": "AVARKIVERA",
diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json
index 82da8421b5..e5a09fb0ce 100644
--- a/app/i18n/locales/ta-IN.json
+++ b/app/i18n/locales/ta-IN.json
@@ -674,6 +674,7 @@
   "Translate": "மொழிபெயர்",
   "Try_again": "மீண்டும் முயற்சி செய்",
   "Two_Factor_Authentication": "இரண்டு பரிமாறு அங்கீகாரம்",
+  "Two_Factor_Success_message": "இரண்டு காரணி உறுதிப்படுத்தல் குறியீடு அனுப்பப்பட்டுள்ளது! உங்கள் மின்னஞ்சலை சரிபார்க்கவும்.",
   "Type_message": "செய்தியை தட்டச்சு",
   "Types": "வகைகள்",
   "UNARCHIVE": "அசைவு செய்",
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index 52a4d61725..1edf105c14 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -674,6 +674,7 @@
   "Translate": "అనువాదం",
   "Try_again": "ప్రయత్నించండి",
   "Two_Factor_Authentication": "రెండు అంశ ప్రామాణీకరణ",
+  "Two_Factor_Success_message": "द्वि-घटक प्रमाणीकरण कोड भेज दिया गया है! कृपया अपना ईमेल जाँचें।",
   "Type_message": "సందేశాన్ని టైప్ చేయండి",
   "Types": "రకాలు",
   "UNARCHIVE": "అనార్కైవ్",
diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json
index 573d1116c2..5647df5c57 100644
--- a/app/i18n/locales/tr.json
+++ b/app/i18n/locales/tr.json
@@ -466,6 +466,7 @@
   "Translate": "Çevir",
   "Try_again": "Tekrar deneyin",
   "Two_Factor_Authentication": "İki faktörlü Kimlik Doğrulama",
+  "Two_Factor_Success_message": "İki faktörlü kimlik doğrulama kodu gönderildi! Lütfen e-postanızı kontrol edin.",
   "Type_message": "İleti yaz",
   "UNARCHIVE": "ARŞİVDEN ÇIKAR",
   "unarchive": "arşivden çıkar",
diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json
index cee8422496..d71d89fc40 100644
--- a/app/i18n/locales/zh-CN.json
+++ b/app/i18n/locales/zh-CN.json
@@ -438,6 +438,7 @@
   "Translate": "翻译",
   "Try_again": "再试一次",
   "Two_Factor_Authentication": "双重认证",
+  "Two_Factor_Success_message": "已发送双因素验证代码！请检查您的电子邮件。",
   "Type_message": "输入信息",
   "UNARCHIVE": "取消封存",
   "unarchive": "取消封存",
diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json
index 113547f1e1..d14281b3c7 100644
--- a/app/i18n/locales/zh-TW.json
+++ b/app/i18n/locales/zh-TW.json
@@ -466,6 +466,7 @@
   "Translate": "翻譯",
   "Try_again": "再試一次",
   "Two_Factor_Authentication": "雙重認證",
+  "Two_Factor_Success_message": "雙重驗證碼已發送！請檢查您的電子郵件。",
   "Type_message": "輸入訊息",
   "UNARCHIVE": "取消封存",
   "unarchive": "取消封存",
diff --git a/app/lib/methods/helpers/events.ts b/app/lib/methods/helpers/events.ts
index a01f8fcc59..c79632e9d3 100644
--- a/app/lib/methods/helpers/events.ts
+++ b/app/lib/methods/helpers/events.ts
@@ -1,3 +1,4 @@
+import { ICredentials } from '../../../definitions';
 import { IEmitUserInteraction } from '../../../containers/UIKit/interfaces';
 import log from './log';
 
@@ -12,6 +13,7 @@ type TEventEmitterEmmitArgs =
 	| { visible: boolean; onCancel?: null | Function }
 	| { cancel: () => void }
 	| { submit: (param: string) => void }
+	| { params: ICredentials }
 	| IEmitUserInteraction;
 
 class EventEmitter {
diff --git a/app/lib/services/connect.ts b/app/lib/services/connect.ts
index 080375bf58..f62adc07f8 100644
--- a/app/lib/services/connect.ts
+++ b/app/lib/services/connect.ts
@@ -335,7 +335,7 @@ function loginTOTP(params: ICredentials, loginEmailPassword?: boolean, isFromWeb
 			if (e.data?.error && (e.data.error === 'totp-required' || e.data.error === 'totp-invalid')) {
 				const { details } = e.data;
 				try {
-					const code = await twoFactor({ method: details?.method || 'totp', invalid: details?.error === 'totp-invalid' });
+					const code = await twoFactor({ params, method: details?.method || 'totp', invalid: details?.error === 'totp-invalid' });
 
 					if (loginEmailPassword) {
 						store.dispatch(setUser({ username: params.user || params.username }));
diff --git a/app/lib/services/restApi.ts b/app/lib/services/restApi.ts
index 6f9540a0f6..c82715aeb4 100644
--- a/app/lib/services/restApi.ts
+++ b/app/lib/services/restApi.ts
@@ -7,7 +7,6 @@ import {
 	IRoom,
 	IRoomNotifications,
 	IServerRoom,
-	IUser,
 	RoomType,
 	SubscriptionType
 } from '../../definitions';
@@ -984,11 +983,8 @@ export const pushTest = () => sdk.post('push.test');
 // RC 6.5.0
 export const pushInfo = () => sdk.get('push.info');
 
-export const sendEmailCode = () => {
-	const { username } = reduxStore.getState().login.user as IUser;
-	// RC 3.1.0
-	return sdk.post('users.2fa.sendEmailCode', { emailOrUsername: username });
-};
+// RC 3.1.0
+export const sendEmailCode = (emailOrUsername: string) => sdk.post('users.2fa.sendEmailCode', { emailOrUsername });
 
 export const getRoomMembers = async ({
 	rid,
diff --git a/app/lib/services/twoFactor.ts b/app/lib/services/twoFactor.ts
index 928bf8c3f3..8714828d93 100644
--- a/app/lib/services/twoFactor.ts
+++ b/app/lib/services/twoFactor.ts
@@ -2,17 +2,20 @@ import { settings } from '@rocket.chat/sdk';
 
 import { TWO_FACTOR } from '../../containers/TwoFactor';
 import EventEmitter from '../methods/helpers/events';
+import { ICredentials } from '../../definitions';
 
 interface ITwoFactor {
 	method: string;
 	invalid: boolean;
+	params?: ICredentials;
 }
 
-export const twoFactor = ({ method, invalid }: ITwoFactor): Promise<{ twoFactorCode: string; twoFactorMethod: string }> =>
+export const twoFactor = ({ method, invalid, params }: ITwoFactor): Promise<{ twoFactorCode: string; twoFactorMethod: string }> =>
 	new Promise((resolve, reject) => {
 		EventEmitter.emit(TWO_FACTOR, {
 			method,
 			invalid,
+			params,
 			cancel: () => reject(),
 			submit: (code: string) => {
 				settings.customHeaders = {