diff --git a/ChangeLog b/ChangeLog
index 3dc2ac840..27c6cc15d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,13 +5,18 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
+2001-06-02  Loïc Chapeaux  <lolo@phpheaven.net>
+	* users_details.lib.php3: fixed some typos, warnings and little bugs
+	* lib.inc.php3, lines 144 & 147: wrong var names
+	* main.php3, line 135: replaced a 'mysql_db_query'
+
 2001-06-01  Marc Delisle  <lem9@users.sourceforge.net>
-        * merge User administration module thanks to Daniel Villanueva (dvilla)
-        * small modifications to this module
-        * new add_message_file.sh
+	* merge User administration module thanks to Daniel Villanueva (dvilla)
+	* small modifications to this module
+	* new add_message_file.sh
 
 2001-05-31  Marc Delisle  <lem9@users.sourceforge.net>
-        * tbl_replace.php3, tbl_change.php3: bug 424771
+	* tbl_replace.php3, tbl_change.php3: bug 424771
 
 2001-05-30  Loïc Chapeaux  <lolo@phpheaven.net>
 	* left.js, left.php3 : beautify the way database list is displayed with NS4
diff --git a/lib.inc.php3 b/lib.inc.php3
index 44f9c597b..56f7043a7 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -141,10 +141,10 @@ if($server == 0) {
         $PHP_AUTH_USER = $REMOTE_USER;
       }
       else if (!empty($HTTP_ENV_VARS) && isset($HTTP_ENV_VARS['REMOTE_USER'])) {
-        $REMOTE_USER = $HTTP_ENV_VARS['REMOTE_USER'];
+        $PHP_AUTH_USER = $HTTP_ENV_VARS['REMOTE_USER'];
       }
       else if (@getenv('REMOTE_USER')) {
-        $REMOTE_USER = getenv('REMOTE_USER');
+        $PHP_AUTH_USER = getenv('REMOTE_USER');
       }
     }
     // Grab the $PHP_AUTH_PW variable whatever are the values of the