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 050bba709c3b..2b64b1fa2c38 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,7 +1215,9 @@ public synchronized String login() {
 			auth.setLocalPassword(null);
 			clearAuthenticationFailedMessage();
 			if (logon.getEnable2fa()
-					&& (Settings.getBoolean(SettingCodes.TRUSTED_HOST_2FA_REQUIRED, Bundle.SETTINGS, DefaultSettings.TRUSTED_HOST_2FA_REQUIRED) || !WebUtil.isTrustedHost())) {
+					&& (logon.getShowOtpRegistrationInfo()
+							|| Settings.getBoolean(SettingCodes.TRUSTED_HOST_2FA_REQUIRED, Bundle.SETTINGS, DefaultSettings.TRUSTED_HOST_2FA_REQUIRED)
+							|| !WebUtil.isTrustedHost())) {
 				otpRequired = true;
 				outcome = getLoginOutcome(false);
 			} else {