diff --git a/ChangeLog b/ChangeLog
index 9384ca71d..b4ddfd02b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-08-23 Michal Čihař  <michal@cihar.com>
+    * libraries/database_interface.lib.php: Abide cfg['Lang'] settings even if
+      using MySQL > 4.1.x (bug #1266626).
+
 2005-08-22 Michal Čihař  <michal@cihar.com>
     * error.php, libraries/common.lib.php, libraries/sanitizing.lib.php:
       Protect against possible XSS (bug #1265740), move input sanitizing to
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 4c3faed83..5d2a4d767 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -156,8 +156,8 @@ function PMA_DBI_postConnect($link, $is_controluser = FALSE) {
     if (PMA_MYSQL_INT_VERSION >= 40100) {
 
         // If $lang is defined and we are on MySQL >= 4.1.x,
-        // we auto-switch the lang to its UTF-8 version (if it exists)
-        if (!empty($GLOBALS['lang']) && (substr($GLOBALS['lang'], -5) != 'utf-8')) {
+        // we auto-switch the lang to its UTF-8 version (if it exists and user didn't force language)
+        if (!empty($GLOBALS['lang']) && (substr($GLOBALS['lang'], -5) != 'utf-8') && !isset($GLOBALS['cfg']['Lang'])) {
             $lang_utf_8_version = substr($GLOBALS['lang'], 0, strpos($GLOBALS['lang'], '-')) . '-utf-8';
             if (!empty($GLOBALS['available_languages'][$lang_utf_8_version])) {
                 $GLOBALS['lang'] = $lang_utf_8_version;