diff --git a/lam/HISTORY b/lam/HISTORY
index f99f0d84..70ad9d30 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -7,6 +7,7 @@ June 2010 3.1.0
   - fixed bugs:
    -> Asterisk password handling (patch 2979728)
    -> Samba domain SID check (2994528)
+   -> language selection at login (2996335)
 
 
 24.03.2010 3.0.0
diff --git a/lam/templates/login.php b/lam/templates/login.php
index 9213c1d9..fefe4386 100644
--- a/lam/templates/login.php
+++ b/lam/templates/login.php
@@ -125,7 +125,7 @@ function display_LoginPage($config_object) {
 			$value = explode(":", $line);
 			$languages[$i]["link"] = $value[0] . ":" . $value[1];
 			$languages[$i]["descr"] = $value[2];
-			if(rtrim($line) == $_SESSION["language"])
+			if(trim($line) == trim($_SESSION["language"]))
 			{
 				$languages[$i]["default"] = "YES";
 			}