diff --git a/ChangeLog b/ChangeLog
index 6bdf9ad39..e1fd8388d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ $Source$
 	  libraries/functions.js, lines 300-398: improved the "mark row" feature so
 	  it can be used with the "pointer" one.
 	* finnish.inc.php3: $strFlushTable thanks to Visa Kopu.
+	* user_password.php3, lines 16-18: fixed bug #534107 - Superusers can't
+	  change password, thanks to
+	  Matthias Fichtner <mfichtner at users.sourceforge.net>.
 
 2002-03-22 Marc Delisle  <lem9@users.sourceforge.net>
 	* finnish, norwegian updates
diff --git a/user_password.php3 b/user_password.php3
index 6335f923c..303c11156 100644
--- a/user_password.php3
+++ b/user_password.php3
@@ -13,6 +13,9 @@ require('./libraries/common.lib.php3');
  * Displays an error message and exits if the user isn't allowed to use this
  * script
  */
+if (!$cfgShowChgPassword) {
+    $cfgShowChgPassword = @mysql_query('USE mysql', $userlink);
+}
 if ($cfgServer['auth_type'] == 'config' || !$cfgShowChgPassword) {
     include('./header.inc.php3');
     echo '<p><b>' . $strError . '</b></p>' . "\n";