diff --git a/org.adempiere.base/src/org/compiere/util/Language.java b/org.adempiere.base/src/org/compiere/util/Language.java
index d967ca378a..8c96e09d1b 100644
--- a/org.adempiere.base/src/org/compiere/util/Language.java
+++ b/org.adempiere.base/src/org/compiere/util/Language.java
@@ -406,7 +406,8 @@ public class Language implements Serializable
 	 */
 	public static Language getLoginLanguage ()
 	{
-		return s_loginLanguage;
+		// return s_loginLanguage; // See bug [2946164]
+		return Env.getLanguage(Env.getCtx());
 	}   //  getLanguage
 
 	/**