diff --git a/web/src/main/java/org/phoenixctms/ctsms/web/model/SessionScopeBean.java b/web/src/main/java/org/phoenixctms/ctsms/web/model/SessionScopeBean.java
index b258a6072038..9d45a7a6b1a6 100644
--- a/web/src/main/java/org/phoenixctms/ctsms/web/model/SessionScopeBean.java
+++ b/web/src/main/java/org/phoenixctms/ctsms/web/model/SessionScopeBean.java
@@ -1215,9 +1215,8 @@ public synchronized String login() {
 			auth.setLocalPassword(null);
 			clearAuthenticationFailedMessage();
 			if (logon.getEnable2fa()
-					&& (logon.getShowOtpRegistrationInfo() &&
-							(Settings.getBoolean(SettingCodes.TRUSTED_HOST_2FA_REQUIRED, Bundle.SETTINGS, DefaultSettings.TRUSTED_HOST_2FA_REQUIRED)
-									|| !WebUtil.isTrustedHost()))) {
+					&& (Settings.getBoolean(SettingCodes.TRUSTED_HOST_2FA_REQUIRED, Bundle.SETTINGS, DefaultSettings.TRUSTED_HOST_2FA_REQUIRED)
+							|| !WebUtil.isTrustedHost())) {
 				otpRequired = true;
 				outcome = getLoginOutcome(false);
 			} else {