diff --git a/ChangeLog b/ChangeLog
index 5ef197669..c4f9d5ff2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-05-04 Loïc Chapeaux  <lolo@phpheaven.net>
+    * user_details.php3, line 984: do not use "mysql_result" if the query
+      fails.
+
 2002-05-03 Loïc Chapeaux  <lolo@phpheaven.net>
     * lang/italian.inc.php3: updated, thanks to Pietro Danesi.
     * tbl_properties.php3; tbl_properties_export.php3;
diff --git a/user_details.php3 b/user_details.php3
index 909797c76..7880017eb 100644
--- a/user_details.php3
+++ b/user_details.php3
@@ -981,7 +981,7 @@ if (mysql_error()) {
     exit();
 }
 $result         = @mysql_query('SELECT COUNT(Password) FROM mysql.user');
-$password_field = (mysql_result($result, 0) ? 'Password' : 'password');
+$password_field = ((!$result || mysql_result($result, 0)) ? 'Password' : 'password');
 
 
 /**