diff --git a/ChangeLog b/ChangeLog
index cb1b998217..0f72889da2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
 4.7.1 (not yet released)
 - issue #13132 Always execute tracking queries as controluser
 - issue #13125 Focus on SQL editor after inserting field name
+- issue #13133 Fixed broken links in setup
 
 4.7.0 (2017-03-28)
 - patch #12233 [Display] Improve message when renaming database to same name
diff --git a/doc/config.rst b/doc/config.rst
index fc1e7709e8..9a016ce393 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -3219,6 +3219,7 @@ Developer
     * There is welcome message on the main page.
     * There is footer information about demo server and used git revision.
     * The setup script is enabled even with existing configuration.
+    * The setup does not try to connect to the MySQL server.
 
 .. _config-examples:
 
diff --git a/libraries/config/Validator.php b/libraries/config/Validator.php
index 6cef15a890..ff6f666a4d 100644
--- a/libraries/config/Validator.php
+++ b/libraries/config/Validator.php
@@ -179,6 +179,11 @@ class Validator
         $pass = null,
         $error_key = 'Server'
     ) {
+        if ($GLOBALS['cfg']['DBG']['demo']) {
+            // Connection test disabled on the demo server!
+            return true;
+        }
+
         //    static::testPHPErrorMsg();
         $error = null;
         $host = PMA_sanitizeMySQLHost($host);
diff --git a/setup/config.php b/setup/config.php
index 8235f965a8..42eecc6920 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -46,6 +46,6 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
     //
     // Show generated config file in a <textarea>
     //
-    $response->generateHeader303('index.php' . URL::getCommonRaw() . '&page=config');
+    $response->generateHeader303('index.php' . URL::getCommonRaw(array('page' => 'config')));
     exit;
 }
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index e6613cc5e0..27f8fab362 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -28,7 +28,6 @@ $all_languages = LanguageManager::getInstance()->sortedLanguages();
 
 /** @var ConfigFile $cf */
 $cf = $GLOBALS['ConfigFile'];
-$separator = URL::getArgSeparator('html');
 
 // message handling
 PMA_messagesBegin();
@@ -157,12 +156,10 @@ if ($cf->getServerCount() > 0) {
         echo '<td>' , htmlspecialchars($cf->getServerDSN($id)) , '</td>';
         echo '<td style="white-space: nowrap">';
         echo '<small>';
-        echo '<a href="' , URL::getCommon() , $separator , 'page=servers'
-            , $separator , 'mode=edit' , $separator , 'id=' , $id , '">'
+        echo '<a href="' , URL::getCommon(array('page' => 'servers', 'mode' => 'edit', 'id' => $id)), '">'
             , __('Edit') , '</a>';
         echo ' | ';
-        echo '<a href="' , URL::getCommon() , $separator , 'page=servers'
-            , $separator , 'mode=remove' , $separator , 'id=' , $id , '">'
+        echo '<a href="' , URL::getCommon(array('page' => 'servers', 'mode' => 'remove', 'id' => $id)), '">'
             , __('Delete') , '</a>';
         echo '</small>';
         echo '</td>';
@@ -270,6 +267,6 @@ echo '<div id="footer">';
 echo '<a href="../url.php?url=https://www.phpmyadmin.net/">' , __('phpMyAdmin homepage') , '</a>';
 echo '<a href="../url.php?url=https://www.phpmyadmin.net/donate/">'
     ,  __('Donate') , '</a>';
-echo '<a href="' ,  URL::getCommon() , $separator , 'version_check=1">'
+echo '<a href="' ,  URL::getCommon(array('version_check' => '1')), '">'
     , __('Check for latest version') , '</a>';
 echo '</div>';
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index e57d9dfb49..366398bcf4 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -39,21 +39,18 @@ function PMA_Process_formset(FormDisplay $form_display)
     }
 
     // form has errors, show warning
-    $separator = URL::getArgSeparator('html');
-    $page = isset($_GET['page']) ? htmlspecialchars($_GET['page']) : null;
-    $formset = isset($_GET['formset']) ? htmlspecialchars($_GET['formset']) : null;
-    $formset = $formset ? "{$separator}formset=$formset" : '';
-    $formId = PMA_isValid($_GET['id'], 'numeric') ? $_GET['id'] : null;
+    $page = isset($_GET['page']) ? $_GET['page'] : '';
+    $formset = isset($_GET['formset']) ? $_GET['formset'] : '';
+    $formId = PMA_isValid($_GET['id'], 'numeric') ? $_GET['id'] : '';
     if ($formId === null && $page == 'servers') {
         // we've just added a new server, get its id
         $formId = $form_display->getConfigFile()->getServerCount();
     }
-    $formId = $formId ? "{$separator}id=$formId" : '';
     ?>
     <div class="error">
         <h4><?php echo __('Warning') ?></h4>
         <?php echo __('Submitted form contains errors') ?><br />
-        <a href="<?php echo URL::getCommon() , $separator ?>page=<?php echo $page , $formset , $formId , $separator ?>mode=revert">
+        <a href="<?php echo URL::getCommon(array('page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'revert')) ?>">
             <?php echo __('Try to revert erroneous fields to their default values') ?>
         </a>
     </div>
@@ -62,8 +59,8 @@ function PMA_Process_formset(FormDisplay $form_display)
         <?php echo __('Ignore errors') ?>
     </a>
     &nbsp;
-    <a class="btn" href="<?php echo URL::getCommon() , $separator ?>page=<?php echo $page , $formset , $formId , $separator ?>mode=edit">
+    <a class="btn" href="<?php echo URL::getCommon(array('page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'edit')) ?>">
         <?php echo __('Show form') ?>
     </a>
     <?php
-}
\ No newline at end of file
+}