diff --git a/ChangeLog b/ChangeLog
index ea655f313..b6f8e998d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   thanks to Virsacer - virsacer
 - bug [history] QueryHistoryDB is not respected
 - bug #2905629 [auth] Blowfish secret is not hashed 
+- bug #2910000 [gui] ShowServerInfo should hide all server info from main page 
 
 3.2.4.0 (2009-12-02)
 - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status 
diff --git a/libraries/config.default.php b/libraries/config.default.php
index ec3680797..a0243e638 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -756,7 +756,7 @@ $cfg['ShowStats'] = true;
 $cfg['ShowPhpInfo'] = false;
 
 /**
- * show MySQL server information
+ * show MySQL server and web server information
  *
  * @global boolean $cfg['ShowServerInfo']
  */
diff --git a/main.php b/main.php
index 9f03810f2..f59e3c2bf 100644
--- a/main.php
+++ b/main.php
@@ -182,19 +182,16 @@ echo '</div>';
 echo '</div>';
 echo '<div id="main_pane_right">';
 
-
-if ($server > 0) {
+if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
     echo '<div class="group">';
     echo '<h2>MySQL</h2>';
     echo '<ul>' . "\n";
     PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info');
     PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_version');
-    if ($GLOBALS['cfg']['ShowServerInfo']) {
-        PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(),
-            'li_mysql_proto');
-        PMA_printListItem($strUser . ': ' . htmlspecialchars($mysql_cur_user_and_host),
-            'li_user_info');
-    }
+    PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(),
+        'li_mysql_proto');
+    PMA_printListItem($strUser . ': ' . htmlspecialchars($mysql_cur_user_and_host),
+        'li_user_info');
 
     echo '    <li id="li_select_mysql_charset">';
     echo '        ' . $strMySQLCharset . ': '
@@ -207,25 +204,28 @@ if ($server > 0) {
     echo ' </div>';
 }
 
+if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) {
+    echo '<div class="group">';
+    echo '<h2>' . $strWebServer . '</h2>';
+    echo '<ul>';
+    if ($GLOBALS['cfg']['ShowServerInfo']) {
+        PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software');
 
-echo '<div class="group">';
-echo '<h2>' . $strWebServer . '</h2>';
-echo '<ul>';
-PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software');
+        if ($server > 0) {
+            PMA_printListItem($strMysqlClientVersion . ': ' . PMA_DBI_get_client_info(),
+                'li_mysql_client_version');
+            PMA_printListItem($strPHPExtension . ': ' . $GLOBALS['cfg']['Server']['extension'],
+                'li_used_php_extension');
+        }
+    }
 
-if ($server > 0) {
-    PMA_printListItem($strMysqlClientVersion . ': ' . PMA_DBI_get_client_info(),
-        'li_mysql_client_version');
-    PMA_printListItem($strPHPExtension . ': ' . $GLOBALS['cfg']['Server']['extension'],
-        'li_used_php_extension');
+    if ($cfg['ShowPhpInfo']) {
+        PMA_printListItem($strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query);
+    }
+    echo '  </ul>';
+    echo ' </div>';
 }
 
-if ($cfg['ShowPhpInfo']) {
-    PMA_printListItem($strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query);
-}
-echo '  </ul>';
-echo ' </div>';
-
 echo '<div class="group">';
 echo '<h2>phpMyAdmin</h2>';
 echo '<ul>';