diff --git a/ChangeLog b/ChangeLog
index d2efbf75f..a7b6f6182 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ $Source$
     * libraries/session.inc.php, Documentation.html: bug #1352479, warn
       if PHP does not support session
     * server_privileges.php: bug #1353435, selecting users to drop is broken
+      and bug #1353437, undefined index while editing a user
 
 2005-11-10 Michal Čihař  <michal@cihar.com>
     * scripts/create-release.sh: = is correct for comparsion in shell.
diff --git a/server_privileges.php b/server_privileges.php
index c0fc4fd5d..083b74c7f 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1687,7 +1687,7 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) {
                        . '        </tt></td>' . "\n"
                        . '    <td>' . (((empty($dbname) && $row['Grant_priv'] == 'Y') || (!empty($dbname) && in_array('Grant', explode(',', $row['Table_priv'])))) ? $GLOBALS['strYes'] : $GLOBALS['strNo']) . '</td>' . "\n"
                        . '    <td>';
-                    if ( $row['Table_priv'] || $row['Column_priv'] ) {
+                    if ((isset($row['Table_priv']) && $row['Table_priv']) || (isset($row['Column_priv']) && $row['Column_priv'])) {
                         echo $GLOBALS['strYes'];
                     } else {
                         echo $GLOBALS['strNo'];
@@ -1700,7 +1700,7 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) {
                         urlencode( empty($dbname) ? '' : $row['Table_name'] ) );
                     echo '</td>' . "\n"
                        . '    <td>';
-                    if ( $row['can_delete'] || $row['Table_name'] ) {
+                    if ( (isset($row['can_delete']) && $row['can_delete']) || (isset($row['Table_name']) && $row['Table_name'])) {
                         printf( $link_revoke, urlencode( $username ),
                             urlencode( $hostname ),
                             urlencode( empty( $dbname ) ? $row['Db'] : $dbname ),