diff --git a/ChangeLog b/ChangeLog
index a4d7251cf..4838451ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   thanks to Virsacer - virsacer
 + [lang] Polish update, thanks to Fixer - fixeron
 - bug #2568722 [designer] Compound key not shown 
+- patch #2550323 [XHTML] in server_databases.php, thanks to Virsacer - virsacer
 
 3.1.2.0 (2009-01-19)
 - bug #1253252 [display] Can't NULL a column with relation defined 
diff --git a/server_databases.php b/server_databases.php
index d076d3b7d..660e7d747 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -211,7 +211,7 @@ if ($databases_count > 0) {
         }
         echo '    <td class="name">' . "\n"
            . '        <a onclick="'
-           . 'if (window.parent.openDb && window.parent.openDb(\'' . PMA_jsFormat($current['SCHEMA_NAME'], false) . '\')) return false;'
+           . 'if (window.parent.openDb &amp;&amp; window.parent.openDb(\'' . PMA_jsFormat($current['SCHEMA_NAME'], false) . '\')) return false;'
            . '" href="index.php?' . $url_query . '&amp;db='
            . urlencode($current['SCHEMA_NAME']) . '" title="'
            . sprintf($strJumpToDB, htmlspecialchars($current['SCHEMA_NAME']))