diff --git a/org.adempiere.base/src/org/compiere/util/Login.java b/org.adempiere.base/src/org/compiere/util/Login.java
index ce43e6517e..082dcd0ce2 100644
--- a/org.adempiere.base/src/org/compiere/util/Login.java
+++ b/org.adempiere.base/src/org/compiere/util/Login.java
@@ -1309,7 +1309,7 @@ public class Login
 			if (hasTenant) {
 				client = MClient.getByLoginPrefix(app_tenant);
 				if (client == null) {
-					loginErrMsg = Msg.getMsg(m_ctx, "TenantNotFound", new Object[] {app_tenant});
+					loginErrMsg = Msg.getMsg(m_ctx, "FailedLogin");
 					return null;
 				}
 			}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ValidateMFAPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ValidateMFAPanel.java
index 7614299e3d..e7c34a09ed 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ValidateMFAPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ValidateMFAPanel.java
@@ -134,6 +134,8 @@ public class ValidateMFAPanel extends Window implements EventListener<Event> {
 
 			if (m_autoCall) {
 				validateMFAComplete(true);
+			} else {
+				m_showMFAPanel = true;
 			}
 
 		} else {