diff --git a/ChangeLog b/ChangeLog
index 55bf7a5e9..6b935b635 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ $Source$
 2005-11-25 Michal Čihař  <michal@cihar.com>
     * libraries/common.lib.php, libraries/footer.inc.php,
       libraries/header.inc.php: Header and footer per themes (RFE #984152).
+    * libraries/select_lang.lib.php: Fix undefined indexes.
 
 2005-11-24 Marc Delisle  <lem9@users.sourceforge.net>
     * js/querywindow.js: bug #1365503, "do not overwrite this query"
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index d684f10e5..7ad5ec6a3 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -22,12 +22,12 @@
  */
 function PMA_langCheck() {
     // check forced language
-    if ( PMA_langSet($GLOBALS['cfg']['Lang']) ) {
+    if ( isset($GLOBALS['cfg']['Lang']) && PMA_langSet($GLOBALS['cfg']['Lang']) ) {
         return true;
     }
 
     // check previous set language
-    if ( PMA_langSet($_REQUEST['lang']) ) {
+    if ( isset($_REQUEST['lang']) && PMA_langSet($_REQUEST['lang']) ) {
         return true;
     }
     if ( PMA_langSet( $_COOKIE['pma_lang'] ) ) {