diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
index 1ef25a1c0f..e9f93fe1b2 100644
--- a/libraries/replication.inc.php
+++ b/libraries/replication.inc.php
@@ -21,9 +21,9 @@ $server_master_replication = $GLOBALS['dbi']->fetchResult('SHOW MASTER STATUS');
 $server_slave_multi_replication = $GLOBALS['dbi']->fetchResult('SHOW ALL SLAVES STATUS');
 
 /**
- * set slave selected server
+ * set selected master server
  */
-if ($server_slave_multi_replication && $_REQUEST['master_connection']) {
+if ($server_slave_multi_replication && !empty($_REQUEST['master_connection'])) {
     $GLOBALS['dbi']->query("SET @@default_master_connection = '" . PMA_Util::sqlAddSlashes($_REQUEST['master_connection']) . "'");
     $GLOBALS['url_params']['master_connection'] = $_REQUEST['master_connection'];
 }
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index c5bbb2c4d8..f69ff4ee32 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -142,12 +142,12 @@ function PMA_getHtmlForSlaveConfiguration(
     if ($GLOBALS['server_slave_multi_replication']) {
         $html .= __('Master connection:');
         $html .= '<form method="get" action="server_replication.php">';
-        $html .= PMA_URL_getHiddenInputs($url_params);
+        $html .= PMA_URL_getHiddenInputs($GLOBALS['url_params']);
         $html .= ' <select name="master_connection">';
         $html .= '<option value="">' . __('Default') . '</option>';
         foreach ($GLOBALS['server_slave_multi_replication'] as $server) {
-            $html .= '<option' . ($server['Connection_name'] == $_REQUEST['master_connection'] ? ' selected="selected"' : '') . '>' .
-            $server['Connection_name'] . '</option>';
+            $html .= '<option' . (isset($_REQUEST['master_connection']) && $_REQUEST['master_connection'] == $server['Connection_name'] ?
+                ' selected="selected"' : '') . '>' . $server['Connection_name'] . '</option>';
         }
         $html .= '</select>';
         $html .= ' <input type="submit" value="' . __('Go') . '" id="goButton" />';