diff --git a/ChangeLog b/ChangeLog
index b723aadb1..3eab2d3fc 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ $Source$
 	  <kawada at den.fujifilm.co.jp>.
 	* main.php3: tried a fix against bug #510223 (Create Database link) thanks
 	  to Purodha B Blissenbach <purodha at sourceforge.net>.
+	* libraries/auth/*: patch #522671 - Add charset when asking for auth,
+	  thanks to "nijel".
 
 2002-02-24 Loīc Chapeaux  <lolo@phpheaven.net>
 	* lang/german.inc.php3: updated thanks to Alexander M. Turek.
diff --git a/libraries/auth/config.auth.lib.php3 b/libraries/auth/config.auth.lib.php3
index 4a9301327..362d5a25d 100644
--- a/libraries/auth/config.auth.lib.php3
+++ b/libraries/auth/config.auth.lib.php3
@@ -82,6 +82,9 @@ if (!defined('PMA_CONFIG_AUTH_INCLUDED')) {
                         . $cfgServer['host'] . $server_port . $server_socket . ', '
                         . $cfgServer['user'] . ', '
                         . $cfgServer['password'] . ')';
+
+        // Defines the charset to be used
+        header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
         ?>
 <!DOCTYPE html
     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
diff --git a/libraries/auth/cookie.auth.lib.php3 b/libraries/auth/cookie.auth.lib.php3
index 0947e3f17..0fc4dc192 100644
--- a/libraries/auth/cookie.auth.lib.php3
+++ b/libraries/auth/cookie.auth.lib.php3
@@ -77,6 +77,10 @@ if (!defined('PMA_COOKIE_AUTH_INCLUDED')) {
         }
 
         $cell_align = ($GLOBALS['text_dir'] == 'ltr') ? 'left' : 'right';
+
+        // Defines the charset to be used
+        header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
+
         // Title
         ?>
 <!DOCTYPE html
diff --git a/libraries/auth/http.auth.lib.php3 b/libraries/auth/http.auth.lib.php3
index 38f330d02..aab719697 100644
--- a/libraries/auth/http.auth.lib.php3
+++ b/libraries/auth/http.auth.lib.php3
@@ -28,6 +28,9 @@ if (!defined('PMA_HTTP_AUTH_INCLUDED')) {
         header('WWW-Authenticate: Basic realm="phpMyAdmin ' . sprintf($GLOBALS['strRunning'], (empty($GLOBALS['cfgServer']['verbose']) ? str_replace('\'', '\\\'',$GLOBALS['cfgServer']['host']) : str_replace('\'', '\\\'', $GLOBALS['cfgServer']['verbose']))) .  '"');
         header('HTTP/1.0 401 Unauthorized');
         header('status: 401 Unauthorized');
+
+        // Defines the charset to be used
+        header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
         ?>
 <!DOCTYPE html
     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
