diff --git a/db_details_common.php3 b/db_details_common.php3
index 6c32d077c..9e62e8f1f 100644
--- a/db_details_common.php3
+++ b/db_details_common.php3
@@ -33,7 +33,7 @@ if (!isset($is_db) || !$is_db) {
         $is_db = @PMA_mysql_select_db($db);
     }
     if (empty($db) || !$is_db) {
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?' . PMA_generate_common_url() . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
         exit();
     }
 } // end if (ensures db exists)
@@ -47,7 +47,7 @@ if (!isset($message)) {
         ?>
 <script type="text/javascript" language="javascript1.2">
 <!--
-window.parent.frames['nav'].location.replace('./left.php3?<?php echo PMA_generate_common_url($db); ?>');
+window.parent.frames['nav'].location.replace('./left.php3?<?php echo PMA_generate_common_url($db, '', '&'); ?>');
 //-->
 </script>
         <?php
diff --git a/libraries/auth/cookie.auth.lib.php3 b/libraries/auth/cookie.auth.lib.php3
index 857cad763..d550e2560 100644
--- a/libraries/auth/cookie.auth.lib.php3
+++ b/libraries/auth/cookie.auth.lib.php3
@@ -417,10 +417,10 @@ if (uname.value == '') {
                 }
             } // end if
             if (!empty($GLOBALS['SERVER_SOFTWARE']) && $GLOBALS['SERVER_SOFTWARE'] == 'Microsoft-IIS/5.0') {
-                header('Refresh: 0; url=' . $cfg['PmaAbsoluteUri'] . 'index.php3?' . PMA_generate_common_url());
+                header('Refresh: 0; url=' . $cfg['PmaAbsoluteUri'] . 'index.php3?' . PMA_generate_common_url('', '', '&'));
             }
             else {
-                header('Location: ' . $cfg['PmaAbsoluteUri'] . 'index.php3?' . PMA_generate_common_url());
+                header('Location: ' . $cfg['PmaAbsoluteUri'] . 'index.php3?' . PMA_generate_common_url('', '', '&'));
             }
             exit();
         } // end if
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index bef5f1b85..5b85a85c1 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -1074,7 +1074,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         // Reloads the navigation frame via JavaScript if required
         if (isset($GLOBALS['reload']) && $GLOBALS['reload']) {
             echo "\n";
-            $reload_url = './left.php3?' . PMA_generate_common_url($GLOBALS['db']);
+            $reload_url = './left.php3?' . PMA_generate_common_url($GLOBALS['db'], '', '&');
             ?>
 <script type="text/javascript" language="javascript1.2">
 <!--
diff --git a/libraries/db_table_exists.lib.php3 b/libraries/db_table_exists.lib.php3
index 4526f89f6..594d72d29 100755
--- a/libraries/db_table_exists.lib.php3
+++ b/libraries/db_table_exists.lib.php3
@@ -13,7 +13,7 @@ if (!isset($is_db) || !$is_db) {
         $is_db = @PMA_mysql_select_db($db);
     }
     if (empty($db) || !$is_db) {
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?' . PMA_generate_common_url() . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
         exit();
     }
 } // end if (ensures db exists)
@@ -24,7 +24,7 @@ if (!isset($is_table) || !$is_table) {
     }
     if (empty($table)
         || !($is_table && @mysql_numrows($is_table))) {
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'db_details.php3?' . PMA_generate_common_url($db) . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'db_details.php3?' . PMA_generate_common_url($db, '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
         exit();
     } else if (isset($is_table)) {
         mysql_free_result($is_table);
diff --git a/libraries/url_generating.lib.php3 b/libraries/url_generating.lib.php3
index 57f7f123d..0d2f66894 100644
--- a/libraries/url_generating.lib.php3
+++ b/libraries/url_generating.lib.php3
@@ -63,19 +63,19 @@ if (!defined('PMA_URL_GENERATION_LIB_INCLUDED')){
      *
      * @author  nijel
      */
-    function PMA_generate_common_url ($db = '', $table = '')
+    function PMA_generate_common_url ($db = '', $table = '', $amp = '&amp;')
     {
         global $lang, $convcharset, $server;
         global $cfg, $allow_recoding;
 
         $result = 'lang=' . $lang
-           . '&amp;server=' . $server;
+           . $amp . 'server=' . $server;
         if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)
-            $result .= '&amp;convcharset=' . $convcharset;
+            $result .= $amp . 'convcharset=' . $convcharset;
         if (!empty($db))
-            $result .= '&amp;db='.urlencode($db);
+            $result .= $amp . 'db='.urlencode($db);
         if (!empty($table))
-            $result .= '&amp;table='.urlencode($table);
+            $result .= $amp . 'table='.urlencode($table);
         return $result;
     }
 }
diff --git a/main.php3 b/main.php3
index e3f1bcc51..014d10a0b 100755
--- a/main.php3
+++ b/main.php3
@@ -43,7 +43,7 @@ else if (isset($reload) && $reload) {
     ?>
 <script type="text/javascript" language="javascript1.2">
 <!--
-window.parent.frames['nav'].location.replace('./left.php3?<?php echo PMA_generate_common_url(); ?>');
+window.parent.frames['nav'].location.replace('./left.php3?<?php echo PMA_generate_common_url('', '', '&'); ?>');
 //-->
 </script>
     <?php
diff --git a/tbl_indexes.php3 b/tbl_indexes.php3
index d590f11cf..d78753683 100644
--- a/tbl_indexes.php3
+++ b/tbl_indexes.php3
@@ -40,7 +40,7 @@ if (!defined('PMA_IDX_INCLUDED')) {
         $is_db = @PMA_mysql_select_db($db);
     }
     if (empty($db) || !$is_db) {
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?' . PMA_generate_common_url() . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
         exit();
     }
     // Not a valid table name -> back to the default db_details sub-page
@@ -49,7 +49,7 @@ if (!defined('PMA_IDX_INCLUDED')) {
     }
     if (empty($table)
         || !($is_table && @mysql_numrows($is_table))) {
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db) . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        header('Location: ' . $cfg['PmaAbsoluteUri'] . $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db, '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
         exit();
     } else if (isset($is_table)) {
         mysql_free_result($is_table);
diff --git a/tbl_replace.php3 b/tbl_replace.php3
index f850af2ee..71e4d84bb 100755
--- a/tbl_replace.php3
+++ b/tbl_replace.php3
@@ -23,7 +23,7 @@ if (!isset($dontlimitchars)) {
 $is_gotofile = FALSE;
 if (isset($after_insert) && $after_insert == 'new_insert') {
     $goto = 'tbl_change.php3?'
-          . PMA_generate_common_url($db, $table)
+          . PMA_generate_common_url($db, $table, '&')
           . '&goto=' . urlencode($goto)
           . '&pos=' . $pos
           . '&session_max_rows=' . $session_max_rows
@@ -33,7 +33,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
           . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
 } else if ($goto == 'sql.php3') {
     $goto = 'sql.php3?'
-          . PMA_generate_common_url($db, $table)
+          . PMA_generate_common_url($db, $table, '&')
           . '&pos=' . $pos
           . '&session_max_rows=' . $session_max_rows
           . '&disp_direction=' . $disp_direction