diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index d4262a38f..5a7847d8a 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -130,7 +130,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      * Includes compatibility code for older config.inc.php3 revisions
      * if necessary
      */
-    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 161) {
+    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 162) {
         include('./libraries/config_import.lib.php3');
     }
 
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3
index 64325b31e..71dbe35dd 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -108,13 +108,13 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
             }
 
             if (!isset($cfg['Servers'][$i]['column_info'])) {
-                $cfg['Servers'][$i]['column_info'] = '';
+                if (isset($cfg['Servers'][$i]['column_comments'])) {
+                    $cfg['Servers'][$i]['column_info'] = $cfg['Servers'][$i]['column_comments'];
+                    unset($cfg['Servers'][$i]['column_comments']);
+                } else {
+                    $cfg['Servers'][$i]['column_info'] = '';
+                }
             }
-            
-            if ($cfg['Servers'][$i]['column_info'] == '' && isset($cfg['Servers'][$i]['column_comments']) && $cfg['Servers'][$i]['column_comments'] != '') {
-                $cfg['Servers'][$i]['column_info'] = $cfg['Servers'][$i]['column_comments'];
-            }
-
 
             if (!isset($cfg['Servers'][$i]['pdf_pages'])) {
                 $cfg['Servers'][$i]['pdf_pages'] = '';