diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php
index dd2dc895b1..93f05b7457 100644
--- a/lang/afrikaans-utf-8.inc.php
+++ b/lang/afrikaans-utf-8.inc.php
@@ -1625,4 +1625,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php
index a2d4cad779..80b8b27846 100644
--- a/lang/albanian-utf-8.inc.php
+++ b/lang/albanian-utf-8.inc.php
@@ -1624,4 +1624,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php
index 21c4e80261..89e213893a 100644
--- a/lang/arabic-utf-8.inc.php
+++ b/lang/arabic-utf-8.inc.php
@@ -1627,4 +1627,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php
index c26456c2e0..d5fd477a03 100644
--- a/lang/azerbaijani-utf-8.inc.php
+++ b/lang/azerbaijani-utf-8.inc.php
@@ -1621,4 +1621,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php
index cb9b2df0bb..6045631298 100644
--- a/lang/bangla-utf-8.inc.php
+++ b/lang/bangla-utf-8.inc.php
@@ -1600,4 +1600,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php
index 615594a6ae..20c4c5e707 100644
--- a/lang/basque-utf-8.inc.php
+++ b/lang/basque-utf-8.inc.php
@@ -1618,4 +1618,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php
index d59557d9f3..2d95e28505 100644
--- a/lang/belarusian_cyrillic-utf-8.inc.php
+++ b/lang/belarusian_cyrillic-utf-8.inc.php
@@ -1600,4 +1600,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php
index b4876fa173..c07dd598a1 100644
--- a/lang/belarusian_latin-utf-8.inc.php
+++ b/lang/belarusian_latin-utf-8.inc.php
@@ -1608,4 +1608,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php
index f1e561d970..b6550172b9 100644
--- a/lang/bosnian-utf-8.inc.php
+++ b/lang/bosnian-utf-8.inc.php
@@ -1624,4 +1624,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php
index 111e4cbb78..2ad0fc50ea 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -1615,4 +1615,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php
index 0bae581318..9792ced478 100644
--- a/lang/bulgarian-utf-8.inc.php
+++ b/lang/bulgarian-utf-8.inc.php
@@ -1621,4 +1621,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php
index 43f5c3f785..60987962b7 100644
--- a/lang/catalan-utf-8.inc.php
+++ b/lang/catalan-utf-8.inc.php
@@ -1595,4 +1595,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php
index 76561137a3..0a9f5375a3 100644
--- a/lang/chinese_simplified-utf-8.inc.php
+++ b/lang/chinese_simplified-utf-8.inc.php
@@ -1608,4 +1608,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php
index 8c63aa1817..269b3e31b6 100644
--- a/lang/chinese_traditional-utf-8.inc.php
+++ b/lang/chinese_traditional-utf-8.inc.php
@@ -1605,4 +1605,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php
index 7445c93dd3..3ee10334d2 100644
--- a/lang/croatian-utf-8.inc.php
+++ b/lang/croatian-utf-8.inc.php
@@ -1602,4 +1602,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php
index 73617c33ba..83c1fd9d15 100644
--- a/lang/czech-utf-8.inc.php
+++ b/lang/czech-utf-8.inc.php
@@ -1606,4 +1606,6 @@ $strSetupZipDumpImportWarning = '[a@?page=form&formset=features#tab_Import_e
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add the following line into [mysqld] section:';  //to translate
 
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php
index 3b47eadfa6..0c02826cf5 100644
--- a/lang/danish-utf-8.inc.php
+++ b/lang/danish-utf-8.inc.php
@@ -1600,4 +1600,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php
index 6a7eda5c87..50c1c70a42 100644
--- a/lang/dutch-utf-8.inc.php
+++ b/lang/dutch-utf-8.inc.php
@@ -1605,4 +1605,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php
index ce6ae6a217..ca383f5e03 100644
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -767,6 +767,8 @@ $strReplication = 'Replication';
 $strReplicationRestartServer = 'Once you restarted MySQL server, please click on Go button. Afterwards, you should see a message informing you, that this server <b>is</b> configured as master';
 $strReplicationSelectDatabases = 'Please select databases:';
 $strReplicationServernConfiguredMaster = 'This server is not configured as master in a replication process. Would you like to <a href="%s">configure</a> it?';
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';
+$strReplicationShowConnectedSlaves = 'Show connected slaves';
 $strReplicationShowMasterStatus = 'Show master status';
 $strReplicationSkippingErrorWarn = 'Skipping error(s) might lead into unsynchronized master and slave!';
 $strReplicationSlaveChangeMaster = 'Change or reconfigure master server';
diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php
index d9f4e3aa68..43eb037717 100644
--- a/lang/estonian-utf-8.inc.php
+++ b/lang/estonian-utf-8.inc.php
@@ -1606,4 +1606,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php
index baca3abb26..6362646175 100644
--- a/lang/finnish-utf-8.inc.php
+++ b/lang/finnish-utf-8.inc.php
@@ -1601,4 +1601,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php
index b2ff2d95d9..98f974ca61 100644
--- a/lang/french-utf-8.inc.php
+++ b/lang/french-utf-8.inc.php
@@ -1597,4 +1597,6 @@ $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.';
 $strZip = '"zippé"';
 
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php
index 1ebbe79b45..71fc626903 100644
--- a/lang/galician-utf-8.inc.php
+++ b/lang/galician-utf-8.inc.php
@@ -1600,4 +1600,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php
index 2a69c3c28e..965cdf326e 100644
--- a/lang/georgian-utf-8.inc.php
+++ b/lang/georgian-utf-8.inc.php
@@ -1605,4 +1605,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php
index 30c0e38928..11d0170958 100644
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -1615,4 +1615,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php
index e64733ed35..de8f5d6110 100644
--- a/lang/greek-utf-8.inc.php
+++ b/lang/greek-utf-8.inc.php
@@ -1623,4 +1623,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php
index 0773a18b90..8e43dfd920 100644
--- a/lang/hebrew-utf-8.inc.php
+++ b/lang/hebrew-utf-8.inc.php
@@ -1618,4 +1618,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php
index 9bda0c5b4a..f70f154a59 100644
--- a/lang/hindi-utf-8.inc.php
+++ b/lang/hindi-utf-8.inc.php
@@ -1626,4 +1626,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php
index d9270cfe41..5b3c4165fd 100644
--- a/lang/hungarian-utf-8.inc.php
+++ b/lang/hungarian-utf-8.inc.php
@@ -1602,4 +1602,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php
index d5bd32fe83..a77a3d0ef7 100644
--- a/lang/indonesian-utf-8.inc.php
+++ b/lang/indonesian-utf-8.inc.php
@@ -1616,4 +1616,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php
index 405e98c863..4890661a24 100644
--- a/lang/italian-utf-8.inc.php
+++ b/lang/italian-utf-8.inc.php
@@ -1605,4 +1605,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php
index 3bbe0cb7ec..01466a7b09 100644
--- a/lang/japanese-utf-8.inc.php
+++ b/lang/japanese-utf-8.inc.php
@@ -1606,4 +1606,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php
index 998ae451d5..29d02abd3e 100644
--- a/lang/korean-utf-8.inc.php
+++ b/lang/korean-utf-8.inc.php
@@ -1621,4 +1621,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php
index cccf82dd8e..e580f090b3 100644
--- a/lang/latvian-utf-8.inc.php
+++ b/lang/latvian-utf-8.inc.php
@@ -1623,4 +1623,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php
index 208513b1af..c7bd88e339 100644
--- a/lang/lithuanian-utf-8.inc.php
+++ b/lang/lithuanian-utf-8.inc.php
@@ -1615,4 +1615,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php
index 280bf62381..014cfa38ea 100644
--- a/lang/macedonian_cyrillic-utf-8.inc.php
+++ b/lang/macedonian_cyrillic-utf-8.inc.php
@@ -1601,4 +1601,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php
index 296e57487d..105ce7803e 100644
--- a/lang/malay-utf-8.inc.php
+++ b/lang/malay-utf-8.inc.php
@@ -1638,4 +1638,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php
index 64ec755e5a..f5389d65e7 100644
--- a/lang/mongolian-utf-8.inc.php
+++ b/lang/mongolian-utf-8.inc.php
@@ -1621,4 +1621,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php
index e34536bc7f..f14d6b3b08 100644
--- a/lang/norwegian-utf-8.inc.php
+++ b/lang/norwegian-utf-8.inc.php
@@ -1598,4 +1598,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php
index b4cc325af4..4e61966cc7 100644
--- a/lang/persian-utf-8.inc.php
+++ b/lang/persian-utf-8.inc.php
@@ -1652,4 +1652,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php
index 3c9064ccbd..e8ff87f786 100644
--- a/lang/polish-utf-8.inc.php
+++ b/lang/polish-utf-8.inc.php
@@ -1594,4 +1594,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php
index 7b0d987c95..3bc0116cb5 100644
--- a/lang/portuguese-utf-8.inc.php
+++ b/lang/portuguese-utf-8.inc.php
@@ -1627,4 +1627,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php
index 3c90623522..aafaf18bb9 100644
--- a/lang/romanian-utf-8.inc.php
+++ b/lang/romanian-utf-8.inc.php
@@ -1607,4 +1607,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php
index 39be01eef4..1425e971d4 100644
--- a/lang/russian-utf-8.inc.php
+++ b/lang/russian-utf-8.inc.php
@@ -1611,4 +1611,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php
index 74b4b2eaf3..74db65a032 100644
--- a/lang/serbian_cyrillic-utf-8.inc.php
+++ b/lang/serbian_cyrillic-utf-8.inc.php
@@ -1600,4 +1600,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php
index e398c5bab5..bf9378a3a1 100644
--- a/lang/serbian_latin-utf-8.inc.php
+++ b/lang/serbian_latin-utf-8.inc.php
@@ -1600,4 +1600,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php
index 97dca3aa55..eec1433015 100644
--- a/lang/sinhala-utf-8.inc.php
+++ b/lang/sinhala-utf-8.inc.php
@@ -1603,4 +1603,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php
index 55872bc2b4..a89b13b5e9 100644
--- a/lang/slovak-utf-8.inc.php
+++ b/lang/slovak-utf-8.inc.php
@@ -1619,4 +1619,6 @@ $strXMLExportTables = 'Export tables';  //to translate
 $strXMLExportTriggers = 'Export triggers';  //to translate
 $strXMLExportViews = 'Export views';  //to translate
 
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php
index d016de3bce..3964312453 100644
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -1620,4 +1620,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php
index c77be51ed2..6a2d9029b8 100644
--- a/lang/spanish-utf-8.inc.php
+++ b/lang/spanish-utf-8.inc.php
@@ -1598,4 +1598,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php
index 97dbadebdf..caca1996fd 100644
--- a/lang/swedish-utf-8.inc.php
+++ b/lang/swedish-utf-8.inc.php
@@ -1597,4 +1597,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php
index 697df528e2..a0f9980fba 100644
--- a/lang/tatarish-utf-8.inc.php
+++ b/lang/tatarish-utf-8.inc.php
@@ -1611,4 +1611,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php
index 9b71cc27fd..73d06675e3 100644
--- a/lang/thai-utf-8.inc.php
+++ b/lang/thai-utf-8.inc.php
@@ -1622,4 +1622,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php
index 95f2ae1f18..0a9a822271 100644
--- a/lang/turkish-utf-8.inc.php
+++ b/lang/turkish-utf-8.inc.php
@@ -1604,4 +1604,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php
index 5a0b1b4619..866f13e18f 100644
--- a/lang/ukrainian-utf-8.inc.php
+++ b/lang/ukrainian-utf-8.inc.php
@@ -1620,4 +1620,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/uzbek_cyrillic-utf-8.inc.php b/lang/uzbek_cyrillic-utf-8.inc.php
index 51db8cd587..9025cdf021 100644
--- a/lang/uzbek_cyrillic-utf-8.inc.php
+++ b/lang/uzbek_cyrillic-utf-8.inc.php
@@ -1602,4 +1602,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/lang/uzbek_latin-utf-8.inc.php b/lang/uzbek_latin-utf-8.inc.php
index 6981069ea7..b8da879a68 100644
--- a/lang/uzbek_latin-utf-8.inc.php
+++ b/lang/uzbek_latin-utf-8.inc.php
@@ -1602,4 +1602,6 @@ $strFullStop = 'Full stop';  //to translate
 $strStart = 'Start';  //to translate
 $strStop = 'Stop';  //to translate
 $strMediaWiki = 'MediaWiki Table';  //to translate
+$strReplicationShowConnectedSlaves = 'Show connected slaves';  //to translate
+$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.';  //to translate
 ?>
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index d460e2e271..435b44136d 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -9,7 +9,8 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-$jscode['master_replication'] = 'divShowHideFunc(\'master_status_href\', \'replication_master_section\');'."\n";
+$jscode['master_replication'] = 'divShowHideFunc(\'master_status_href\', \'replication_master_section\');' . "\n"
+    . 'divShowHideFunc(\'master_slaves_href\', \'replication_slaves_section\');' . "\n";
 
 // Add JS events to generate example my.cnf config lines
 $jscode['configure_master'] = 
@@ -128,6 +129,7 @@ function PMA_replication_gui_changemaster($submitname) {
     echo '</form>'."\n";
 
 }
+
 /**
  * This function prints out table with replication status.
  *
@@ -135,7 +137,7 @@ function PMA_replication_gui_changemaster($submitname) {
  * @param boolean $hidden - if true, then default style is set to hidden, default value false
  * @param boolen $title - if true, then title is displayed, default true
  */
-function PMA_replication_print_status_table ($type, $hidden = false, $title = true) {
+function PMA_replication_print_status_table($type, $hidden = false, $title = true) {
     global ${"{$type}_variables"};
     global ${"{$type}_variables_alerts"};
     global ${"{$type}_variables_oks"};
@@ -203,5 +205,208 @@ function PMA_replication_print_status_table ($type, $hidden = false, $title = tr
     echo '</div>'."\n";
 
 }
+
+/**
+ * Prints table with slave users connected to this master
+ *
+ * @param boolean $hidden - if true, then default style is set to hidden, default value false
+ */
+function PMA_replication_print_slaves_table($hidden = false) {
+
+    // Fetch data
+    $data = PMA_DBI_fetch_result('SHOW SLAVE HOSTS', null, null); 
+
+    echo '  <br />' . "\n";
+    echo '  <div id="replication_slaves_section" style="'. ($hidden ? 'display: none' : '') .'"> ' . "\n";
+    echo '    <table class="data"> ' . "\n";
+    echo '    <thead>' . "\n";
+    echo '      <tr>'."\n";
+    echo '        <th>' . $GLOBALS['strBinLogServerId'] . '</th>' . "\n";
+    echo '        <th>' . $GLOBALS['strHost'] . '</th>' . "\n";
+    echo '      </tr>'."\n";
+    echo '    </thead>'."\n";
+    echo '    <tbody>'."\n";
+
+    $odd_row = true;
+    foreach ($data as $slave) {
+        echo '    <tr class="'. ($odd_row ? 'odd' : 'even') .'">' . "\n";
+        echo '      <td class="value">' . $slave['Server_id'] . '</td>' . "\n";
+        echo '      <td class="value">' . $slave['Host'] . '</td>' . "\n";
+        echo '    </tr>' . "\n";
+
+        $odd_row = !$odd_row;
+    }
+
+    echo '    </tbody>'."\n";
+    echo '    </table>'."\n";
+    echo '    <br />'."\n";
+    PMA_Message::notice('strReplicationShowConnectedSlavesNote')->display();
+    echo '    <br />'."\n";
+    echo '  </div>'."\n";
+
+}
+
+
+/**
+ * Print code to add a replication slave user to the master
+ */
+function PMA_replication_gui_master_addslaveuser() {
+    $fields_info = PMA_DBI_get_fields('mysql', 'user');
+    $username_length = 16;
+    $hostname_length = 41;
+    foreach ($fields_info as $key => $val) {
+        if ($val['Field'] == 'User') {
+            strtok($val['Type'], '()');
+            $v = strtok('()');
+            if (is_int($v)) {
+                $username_length = $v;
+            }
+        } elseif ($val['Field'] == 'Host') {
+            strtok($val['Type'], '()');
+            $v = strtok('()');
+            if (is_int($v)) {
+                $hostname_length = $v;
+            }
+        }
+    }
+    unset($fields_info);
+
+    if (isset($GLOBALS['username']) && strlen($GLOBALS['username']) === 0) {
+        $GLOBALS['pred_username'] = 'any';
+    }
+    echo '<div id="master_addslaveuser_gui">'."\n";
+    echo '<form autocomplete="off" method="post" action="server_privileges.php" onsubmit="return checkAddUser(this);">'."\n";
+    echo PMA_generate_common_hidden_inputs('', '');
+    echo '<fieldset id="fieldset_add_user_login">' . "\n"
+        . '<legend>'.$GLOBALS['strReplicationAddSlaveUser'].'</legend>' . "\n"
+        . '<input id="checkbox_Repl_slave_priv" type="hidden" title="Needed for the replication slaves." value="Y" name="Repl_slave_priv"/>'. "\n"
+        . '<input id="checkbox_Repl_client_priv" type="hidden" title="Needed for the replication slaves." value="Y" name="Repl_client_priv"/>'. "\n"
+        . '<input type="hidden" name="sr_take_action" value="true" />'. "\n"
+        . '<div class="item">' . "\n"
+        . '<label for="select_pred_username">' . "\n"
+        . '    ' . $GLOBALS['strUserName'] . ':' . "\n"
+        . '</label>' . "\n"
+        . '<span class="options">' . "\n"
+        . '    <select name="pred_username" id="select_pred_username" title="' . $GLOBALS['strUserName'] . '"' . "\n"
+        . '        onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n"
+        . '        <option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . $GLOBALS['strAnyUser'] . '</option>' . "\n"
+        . '        <option value="userdefined"' . ((!isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . $GLOBALS['strUseTextField'] . ':</option>' . "\n"
+        . '    </select>' . "\n"
+        . '</span>' . "\n"
+        . '<input type="text" name="username" maxlength="'
+        . $username_length . '" title="' . $GLOBALS['strUserName'] . '"'
+        . (empty($GLOBALS['username'])
+        ? ''
+        : ' value="' . (isset($GLOBALS['new_username'])
+        ? $GLOBALS['new_username']
+        : $GLOBALS['username']) . '"')
+        . ' onchange="pred_username.value = \'userdefined\';" />' . "\n"
+        . '</div>' . "\n"
+        . '<div class="item">' . "\n"
+        . '<label for="select_pred_hostname">' . "\n"
+        . '    ' . $GLOBALS['strHost'] . ':' . "\n"
+        . '</label>' . "\n"
+        . '<span class="options">' . "\n"
+        . '    <select name="pred_hostname" id="select_pred_hostname" title="' . $GLOBALS['strHost'] . '"' . "\n";
+    $_current_user = PMA_DBI_fetch_value('SELECT USER();');
+    if (! empty($_current_user)) {
+        $thishost = str_replace("'", '', substr($_current_user, (strrpos($_current_user, '@') + 1)));
+        if ($thishost == 'localhost' || $thishost == '127.0.0.1') {
+            unset($thishost);
+        }
+    }
+    echo '    onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } '
+        . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ')
+        . 'else if (this.value == \'hosttable\') { hostname.value = \'\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
+    unset($_current_user);
+
+    // when we start editing a user, $GLOBALS['pred_hostname'] is not defined
+    if (!isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) {
+        switch (strtolower($GLOBALS['hostname'])) {
+        case 'localhost':
+        case '127.0.0.1':
+            $GLOBALS['pred_hostname'] = 'localhost';
+            break;
+        case '%':
+            $GLOBALS['pred_hostname'] = 'any';
+            break;
+        default:
+            $GLOBALS['pred_hostname'] = 'userdefined';
+            break;
+        }
+    }
+    echo '        <option value="any"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'any')
+        ? ' selected="selected"' : '') . '>' . $GLOBALS['strAnyHost']
+        . '</option>' . "\n"
+        . '        <option value="localhost"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'localhost')
+        ? ' selected="selected"' : '') . '>' . $GLOBALS['strLocalhost']
+        . '</option>' . "\n";
+    if (!empty($thishost)) {
+        echo '        <option value="thishost"'
+            . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'thishost')
+            ? ' selected="selected"' : '') . '>' . $GLOBALS['strThisHost']
+            . '</option>' . "\n";
+    }
+    unset($thishost);
+    echo '        <option value="hosttable"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'hosttable')
+        ? ' selected="selected"' : '') . '>' . $GLOBALS['strUseHostTable']
+        . '</option>' . "\n"
+        . '        <option value="userdefined"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'userdefined')
+        ? ' selected="selected"' : '')
+        . '>' . $GLOBALS['strUseTextField'] . ':</option>' . "\n"
+        . '    </select>' . "\n"
+        . '</span>' . "\n"
+        . '<input type="text" name="hostname" maxlength="'
+        . $hostname_length . '" value="'
+        . (isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '')
+        . '" title="' . $GLOBALS['strHost']
+        . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
+        . PMA_showHint($GLOBALS['strHostTableExplanation'])
+        . '</div>' . "\n"
+        . '<div class="item">' . "\n"
+        . '<label for="select_pred_password">' . "\n"
+        . '    ' . $GLOBALS['strPassword'] . ':' . "\n"
+        . '</label>' . "\n"
+        . '<span class="options">' . "\n"
+        . '    <select name="pred_password" id="select_pred_password" title="'
+        . $GLOBALS['strPassword'] . '"' . "\n"
+        . '            onchange="if (this.value == \'none\') { pma_pw.value = \'\'; pma_pw2.value = \'\'; } else if (this.value == \'userdefined\') { pma_pw.focus(); pma_pw.select(); }">' . "\n"
+        . '        <option value="none"';
+    if (isset($GLOBALS['username']) && $mode != 'change') {
+        echo '  selected="selected"';
+    }
+    echo '>' . $GLOBALS['strNoPassword'] . '</option>' . "\n"
+        . '        <option value="userdefined"' . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>' . $GLOBALS['strUseTextField'] . ':</option>' . "\n"
+        . '    </select>' . "\n"
+        . '</span>' . "\n"
+        . '<input type="password" id="text_pma_pw" name="pma_pw" title="' . $GLOBALS['strPassword'] . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
+        . '</div>' . "\n"
+        . '<div class="item">' . "\n"
+        . '<label for="text_pma_pw2">' . "\n"
+        . '    ' . $GLOBALS['strReType'] . ':' . "\n"
+        . '</label>' . "\n"
+        . '<span class="options">&nbsp;</span>' . "\n"
+        . '<input type="password" name="pma_pw2" id="text_pma_pw2" title="' . $GLOBALS['strReType'] . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
+        . '</div>' . "\n"
+        . '<div class="item">' . "\n"
+        . '<label for="button_generate_password">' . "\n"
+        . '    ' . $GLOBALS['strGeneratePassword'] . ':' . "\n"
+        . '</label>' . "\n"
+        . '<span class="options">' . "\n"
+        . '    <input type="button" id="button_generate_password" value="' . $GLOBALS['strGenerate'] . '" onclick="suggestPassword(this.form)" />' . "\n"
+        . '</span>' . "\n"
+        . '<input type="text" name="generated_pw" id="generated_pw" />' . "\n"
+        . '</div>' . "\n"
+        . '</fieldset>' . "\n";
+    echo '<fieldset id="fieldset_user_privtable_footer" class="tblFooters">' . "\n"
+        . '    <input type="submit" name="adduser_submit" id="adduser_submit" value="' . $GLOBALS['strGo'] . '" />' . "\n"
+        . '</fieldset>' . "\n";
+    echo '</form>'."\n";
+    echo '</div>'."\n";
+}
 ?>
 
diff --git a/server_replication.php b/server_replication.php
index 01cddecaad..4b6369ccac 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -177,6 +177,7 @@ echo '   <img class="icon" src="'. $GLOBALS['pmaThemeImage'] .'s_replication.png
 echo     $GLOBALS['strReplication']."\n";
 echo ' </h2>'."\n";
 
+// Display error messages
 if (isset($_SESSION['replication']['sr_action_status']) && isset($_SESSION['replication']['sr_action_info'])) {
     if ($_SESSION['replication']['sr_action_status'] == 'error') {
         PMA_Message::error($_SESSION['replication']['sr_action_info'])->display();
@@ -194,174 +195,25 @@ if ($server_master_status) {
         echo '<legend>'. $GLOBALS['strReplicationMaster'] .'</legend>'."\n";
         echo $GLOBALS['strReplicationConfiguredMaster']."\n";
         echo '<ul>'."\n";
-        echo '  <li><a href="#" id="master_status_href">'. $GLOBALS['strReplicationShowMasterStatus'] .'</a></li>';
+        echo '  <li><a href="#" id="master_status_href">'. $GLOBALS['strReplicationShowMasterStatus'] .'</a></li>' . "\n";
         PMA_replication_print_status_table('master', true, false);
+
+        echo '  <li><a href="#" id="master_slaves_href">'. $GLOBALS['strReplicationShowConnectedSlaves'] .'</a></li>' . "\n";
+        PMA_replication_print_slaves_table(true);
+
         $_url_params = $GLOBALS['url_params'];
         $_url_params['mr_adduser'] = true;
         $_url_params['repl_clear_scr'] = true;
 
         echo '  <li><a href="'.PMA_generate_common_url($_url_params).'" id="master_addslaveuser_href">'. $GLOBALS['strReplicationAddSlaveUser'] .'</a></li>';
     }
+
+    // Display 'Add replication slave user' form
     if (isset($GLOBALS['mr_adduser'])) {
-        $fields_info = PMA_DBI_get_fields('mysql', 'user');
-        $username_length = 16;
-        $hostname_length = 41;
-        foreach ($fields_info as $key => $val) {
-            if ($val['Field'] == 'User') {
-                strtok($val['Type'], '()');
-                $v = strtok('()');
-                if (is_int($v)) {
-                    $username_length = $v;
-                }
-            } elseif ($val['Field'] == 'Host') {
-                strtok($val['Type'], '()');
-                $v = strtok('()');
-                if (is_int($v)) {
-                    $hostname_length = $v;
-                }
-            }
-        }
-        unset($fields_info);
-
-        if (isset($GLOBALS['username']) && strlen($GLOBALS['username']) === 0) {
-            $GLOBALS['pred_username'] = 'any';
-        }
-        echo '<div id="master_addslaveuser_gui">'."\n";
-        echo '<form autocomplete="off" method="post" action="server_privileges.php" onsubmit="return checkAddUser(this);">'."\n";
-        echo PMA_generate_common_hidden_inputs('', '');
-        echo '<fieldset id="fieldset_add_user_login">' . "\n"
-            . '<legend>'.$GLOBALS['strReplicationAddSlaveUser'].'</legend>' . "\n"
-            . '<input id="checkbox_Repl_slave_priv" type="hidden" title="Needed for the replication slaves." value="Y" name="Repl_slave_priv"/>'. "\n"
-            . '<input id="checkbox_Repl_client_priv" type="hidden" title="Needed for the replication slaves." value="Y" name="Repl_client_priv"/>'. "\n"
-            . '<input type="hidden" name="sr_take_action" value="true" />'. "\n"
-            . '<div class="item">' . "\n"
-            . '<label for="select_pred_username">' . "\n"
-            . '    ' . $GLOBALS['strUserName'] . ':' . "\n"
-            . '</label>' . "\n"
-            . '<span class="options">' . "\n"
-            . '    <select name="pred_username" id="select_pred_username" title="' . $GLOBALS['strUserName'] . '"' . "\n"
-            . '        onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n"
-            . '        <option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . $GLOBALS['strAnyUser'] . '</option>' . "\n"
-            . '        <option value="userdefined"' . ((!isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . $GLOBALS['strUseTextField'] . ':</option>' . "\n"
-            . '    </select>' . "\n"
-            . '</span>' . "\n"
-            . '<input type="text" name="username" maxlength="'
-            . $username_length . '" title="' . $GLOBALS['strUserName'] . '"'
-            . (empty($GLOBALS['username'])
-            ? ''
-            : ' value="' . (isset($GLOBALS['new_username'])
-            ? $GLOBALS['new_username']
-            : $GLOBALS['username']) . '"')
-            . ' onchange="pred_username.value = \'userdefined\';" />' . "\n"
-            . '</div>' . "\n"
-            . '<div class="item">' . "\n"
-            . '<label for="select_pred_hostname">' . "\n"
-            . '    ' . $GLOBALS['strHost'] . ':' . "\n"
-            . '</label>' . "\n"
-            . '<span class="options">' . "\n"
-            . '    <select name="pred_hostname" id="select_pred_hostname" title="' . $GLOBALS['strHost'] . '"' . "\n";
-        $_current_user = PMA_DBI_fetch_value('SELECT USER();');
-        if (! empty($_current_user)) {
-            $thishost = str_replace("'", '', substr($_current_user, (strrpos($_current_user, '@') + 1)));
-            if ($thishost == 'localhost' || $thishost == '127.0.0.1') {
-                unset($thishost);
-            }
-        }
-        echo '    onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } '
-            . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ')
-            . 'else if (this.value == \'hosttable\') { hostname.value = \'\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
-        unset($_current_user);
-
-        // when we start editing a user, $GLOBALS['pred_hostname'] is not defined
-        if (!isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) {
-            switch (strtolower($GLOBALS['hostname'])) {
-            case 'localhost':
-            case '127.0.0.1':
-                $GLOBALS['pred_hostname'] = 'localhost';
-                break;
-            case '%':
-                $GLOBALS['pred_hostname'] = 'any';
-                break;
-            default:
-                $GLOBALS['pred_hostname'] = 'userdefined';
-                break;
-            }
-        }
-        echo '        <option value="any"'
-            . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'any')
-            ? ' selected="selected"' : '') . '>' . $GLOBALS['strAnyHost']
-            . '</option>' . "\n"
-            . '        <option value="localhost"'
-            . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'localhost')
-            ? ' selected="selected"' : '') . '>' . $GLOBALS['strLocalhost']
-            . '</option>' . "\n";
-        if (!empty($thishost)) {
-            echo '        <option value="thishost"'
-                . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'thishost')
-                ? ' selected="selected"' : '') . '>' . $GLOBALS['strThisHost']
-                . '</option>' . "\n";
-        }
-        unset($thishost);
-        echo '        <option value="hosttable"'
-            . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'hosttable')
-            ? ' selected="selected"' : '') . '>' . $GLOBALS['strUseHostTable']
-            . '</option>' . "\n"
-            . '        <option value="userdefined"'
-            . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'userdefined')
-            ? ' selected="selected"' : '')
-            . '>' . $GLOBALS['strUseTextField'] . ':</option>' . "\n"
-            . '    </select>' . "\n"
-            . '</span>' . "\n"
-            . '<input type="text" name="hostname" maxlength="'
-            . $hostname_length . '" value="'
-            . (isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '')
-            . '" title="' . $GLOBALS['strHost']
-            . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
-            . PMA_showHint($GLOBALS['strHostTableExplanation'])
-            . '</div>' . "\n"
-            . '<div class="item">' . "\n"
-            . '<label for="select_pred_password">' . "\n"
-            . '    ' . $GLOBALS['strPassword'] . ':' . "\n"
-            . '</label>' . "\n"
-            . '<span class="options">' . "\n"
-            . '    <select name="pred_password" id="select_pred_password" title="'
-            . $GLOBALS['strPassword'] . '"' . "\n"
-            . '            onchange="if (this.value == \'none\') { pma_pw.value = \'\'; pma_pw2.value = \'\'; } else if (this.value == \'userdefined\') { pma_pw.focus(); pma_pw.select(); }">' . "\n"
-            . '        <option value="none"';
-        if (isset($GLOBALS['username']) && $mode != 'change') {
-            echo '  selected="selected"';
-        }
-        echo '>' . $GLOBALS['strNoPassword'] . '</option>' . "\n"
-            . '        <option value="userdefined"' . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>' . $GLOBALS['strUseTextField'] . ':</option>' . "\n"
-            . '    </select>' . "\n"
-            . '</span>' . "\n"
-            . '<input type="password" id="text_pma_pw" name="pma_pw" title="' . $GLOBALS['strPassword'] . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
-            . '</div>' . "\n"
-            . '<div class="item">' . "\n"
-            . '<label for="text_pma_pw2">' . "\n"
-            . '    ' . $GLOBALS['strReType'] . ':' . "\n"
-            . '</label>' . "\n"
-            . '<span class="options">&nbsp;</span>' . "\n"
-            . '<input type="password" name="pma_pw2" id="text_pma_pw2" title="' . $GLOBALS['strReType'] . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
-            . '</div>' . "\n"
-            . '<div class="item">' . "\n"
-            . '<label for="button_generate_password">' . "\n"
-            . '    ' . $GLOBALS['strGeneratePassword'] . ':' . "\n"
-            . '</label>' . "\n"
-            . '<span class="options">' . "\n"
-            . '    <input type="button" id="button_generate_password" value="' . $GLOBALS['strGenerate'] . '" onclick="suggestPassword(this.form)" />' . "\n"
-            . '</span>' . "\n"
-            . '<input type="text" name="generated_pw" id="generated_pw" />' . "\n"
-            . '</div>' . "\n"
-            . '</fieldset>' . "\n";
-        echo '<fieldset id="fieldset_user_privtable_footer" class="tblFooters">' . "\n"
-            . '    <input type="submit" name="adduser_submit" id="adduser_submit" value="' . $GLOBALS['strGo'] . '" />' . "\n"
-            . '</fieldset>' . "\n";
-        echo '</form>'."\n";
-        echo '</div>'."\n";///////
+        PMA_replication_gui_master_addslaveuser();
     } elseif (!isset($GLOBALS['repl_clear_scr'])) {
         echo "</ul>\n";
-        echo '</fieldset>'."\n";
+        echo "</fieldset>\n";
     }
 } elseif (!isset($GLOBALS['mr_configure']) && !isset($GLOBALS['repl_clear_scr'])) {
     $_url_params = $GLOBALS['url_params'];