Index: branches/main/admin/interface/version.php
===================================================================
--- branches/main/admin/interface/version.php	(revision 32)
+++ branches/main/admin/interface/version.php	(revision 33)
@@ -44,7 +44,7 @@
 if (!defined('VERSION_LOADED')) {
     $sInfo = '
         VERSION  = "2.11.0-RC1"
-        REVISION = "32"
+        REVISION = "33"
         SP       = ""
     ';
     foreach (parse_ini_string($sInfo) as $item=>$value) {
Index: branches/main/framework/initialize.php
===================================================================
--- branches/main/framework/initialize.php	(revision 32)
+++ branches/main/framework/initialize.php	(revision 33)
@@ -425,24 +425,23 @@
         if (defined('ENABLED_ASP') && ENABLED_ASP && !isset($_SESSION['session_started'])) {
             $_SESSION['session_started'] = time();
         }
-        // Get users language
-        $sLang = $oRequest->issetParam('lang');
-        if (
-            !$sLang ||
-            !preg_match('/^([a-z]{2})(?:[\-_]([a-z]{2})(?:[\-_]([a-z\-_]{2,8}))?)?$/i', $sLang, $aMatches)
-        ) {
-            if (isset($_SESSION['LANGUAGE']) AND $_SESSION['LANGUAGE'] != '') {
-                define('LANGUAGE', $_SESSION['LANGUAGE']);
+// Get users language --------------------------------------------------------------------
+        $sLang = $oRequest->getParam('lang');
+        $aMatches = [];
+        $sPattern = '/^\s*([a-z]{2})(?:[\-_]([a-z]{2})(?:[\-_]([a-z\-_]{2,8}))?)?[\s_\-]*$/i';
+        if ($sLang && preg_match($sPattern, $sLang, $aMatches)) {
+            $sLang = strtoupper($aMatches[1]);
+            define('LANGUAGE', $sLang);
+            $_SESSION['LANGUAGE'] = $sLang;
+        } else {
+            if (isset($_SESSION['LANGUAGE']) && preg_match($sPattern, $_SESSION['LANGUAGE'], $aMatches)) {
+                define('LANGUAGE', strtoupper($aMatches[1]));
             } else {
                 define('LANGUAGE', DEFAULT_LANGUAGE);
             }
-        } else {
-            $sLang = strtoupper($aMatches[1]);
-            define('LANGUAGE', $sLang);
-            $_SESSION['LANGUAGE'] = $sLang;
         }
-        unset($sLang);
-        // Load Language file(s)
+        unset($sLang, $sPattern, $aMatches);
+// Load Language file(s) -----------------------------------------------------------------
         $sCurrLanguage = '';
         $slangFile = WB_PATH.'/languages/EN.php';
         if (is_readable($slangFile)) {