diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 84e8192e6..cc69413e4 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -539,7 +539,7 @@ if ($_SESSION['PMA_Config']->get('ForceSSL')
     PMA_sendHeaderLocation(
         preg_replace('/^http/', 'https',
             $_SESSION['PMA_Config']->get('PmaAbsoluteUri'))
-        . PMA_generate_common_url($_GET, '&'));
+        . PMA_generate_common_url($_GET, 'text'));
     exit;
 }
 
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index 6e1c87b3a..8521c6d6a 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -183,13 +183,17 @@ function PMA_getHiddenFields($values, $pre = '')
  * @uses    implode()
  * @param   mixed    assoc. array with url params or optional string with database name
  *                   if first param is an array there is also an ? prefixed to the url
- * @param   string   if first param is array: optional character to use
- *                   instead of '&' for dividing URL parameters
- *                   else, optional table name 
- * @param   string   if first param is array: optional character to
+ *
+ * @param   string   - if first param is array: 'html' to use htmlspecialchars()
+ *                   on the resulting URL (for a normal URL displayed in HTML)
+ *                   or something else to avoid using htmlspecialchars() (for
+ *                   a URL sent via a header); if not set,'html' is assumed
+ *                   - if first param is not array:  optional table name 
+ *
+ * @param   string   - if first param is array: optional character to
  *                   use instead of '?'
- *                   else, optional character to use instead of '&'
- *                   for dividing URL parameters
+ *                   - if first param is not array: optional character to use 
+ *                    instead of '&' for dividing URL parameters
  * @return  string   string with URL parameters
  * @access  public
  * @author  nijel