diff --git a/ChangeLog b/ChangeLog
index 118abb1eb..7c1b84d7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [auth] cookie authentication is now default
 + [auth] do not allow root user without password unless explicitly enabled by
   AllowEmptyRoot
++ rfe #1778908 [auth] arbitrary server auth can now also accept port
 
 3.0.0.0 (not yet released)
 + [export] properly handle line breaks for YAML, thanks to Dan Barry -
diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php
index 147bb9f88..ed226bb3c 100644
--- a/lang/afrikaans-utf-8.inc.php
+++ b/lang/afrikaans-utf-8.inc.php
@@ -1118,4 +1118,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php
index eb56f08aa..4a577bede 100644
--- a/lang/albanian-utf-8.inc.php
+++ b/lang/albanian-utf-8.inc.php
@@ -1117,4 +1117,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php
index ac11d0403..976e43e35 100644
--- a/lang/arabic-utf-8.inc.php
+++ b/lang/arabic-utf-8.inc.php
@@ -1119,4 +1119,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php
index af1b9a6b1..9adfb4553 100644
--- a/lang/azerbaijani-utf-8.inc.php
+++ b/lang/azerbaijani-utf-8.inc.php
@@ -1114,4 +1114,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php
index eb3f2056c..a99eae1b0 100644
--- a/lang/bangla-utf-8.inc.php
+++ b/lang/bangla-utf-8.inc.php
@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php
index 4c62e18c1..bd3e88583 100644
--- a/lang/basque-utf-8.inc.php
+++ b/lang/basque-utf-8.inc.php
@@ -1111,4 +1111,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php
index c2beba8c9..ced6ca438 100644
--- a/lang/belarusian_cyrillic-utf-8.inc.php
+++ b/lang/belarusian_cyrillic-utf-8.inc.php
@@ -1094,4 +1094,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php
index c5bdcb7df..9e41ea755 100644
--- a/lang/belarusian_latin-utf-8.inc.php
+++ b/lang/belarusian_latin-utf-8.inc.php
@@ -1102,4 +1102,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php
index a86de7035..14a0672d1 100644
--- a/lang/bosnian-utf-8.inc.php
+++ b/lang/bosnian-utf-8.inc.php
@@ -1117,4 +1117,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php
index d79528431..579dacf24 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -1091,4 +1091,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php
index 42c017a4c..e25599f6f 100644
--- a/lang/bulgarian-utf-8.inc.php
+++ b/lang/bulgarian-utf-8.inc.php
@@ -1114,4 +1114,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php
index 510a8c082..f11e91196 100644
--- a/lang/catalan-utf-8.inc.php
+++ b/lang/catalan-utf-8.inc.php
@@ -1089,4 +1089,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php
index 7c302250d..9532f7eeb 100644
--- a/lang/chinese_simplified-utf-8.inc.php
+++ b/lang/chinese_simplified-utf-8.inc.php
@@ -1119,4 +1119,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php
index c16eb28eb..6eb71729e 100644
--- a/lang/chinese_traditional-utf-8.inc.php
+++ b/lang/chinese_traditional-utf-8.inc.php
@@ -1098,4 +1098,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php
index 65ac40f53..7d4a2e987 100644
--- a/lang/croatian-utf-8.inc.php
+++ b/lang/croatian-utf-8.inc.php
@@ -1092,4 +1092,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php
index d86013224..794d72fd5 100644
--- a/lang/czech-utf-8.inc.php
+++ b/lang/czech-utf-8.inc.php
@@ -458,6 +458,7 @@ $strLoginInformation = 'Přihlašování';
 $strLogin = 'Přihlášení';
 $strLogout = 'Odhlásit se';
 $strLogPassword = 'Heslo:';
+$strLogServerHelp = 'Můžete zadat jméno počítače/IP adresu a port oddělené mezerou.';
 $strLogServer = 'Server:';
 $strLogUsername = 'Jméno:';
 $strLongOperation = 'Tato operace může trvat velmi dlouho. Chcete je přesto provést?';
diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php
index e75b5e769..fea9b006e 100644
--- a/lang/danish-utf-8.inc.php
+++ b/lang/danish-utf-8.inc.php
@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php
index 067214863..8000c7b2a 100644
--- a/lang/dutch-utf-8.inc.php
+++ b/lang/dutch-utf-8.inc.php
@@ -1115,4 +1115,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php
index 8bf789595..5a1e32298 100644
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -133,26 +133,6 @@ $strCardinality = 'Cardinality';
 $strCaseInsensitive = 'case-insensitive';
 $strCaseSensitive = 'case-sensitive';
 $strCentralEuropean = 'Central European';
-$strChange = 'Change';
-$strChangeCopyModeCopy = '... keep the old one.';
-$strChangeCopyMode = 'Create a new user with the same privileges and ...';
-$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';
-$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';
-$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';
-$strChangeCopyUser = 'Change Login Information / Copy User';
-$strChangeDisplay = 'Choose field to display';
-$strChangePassword = 'Change password';
-$strCharset = 'Charset';
-$strCharsetOfFile = 'Character set of the file:';
-$strCharsetsAndCollations = 'Character Sets and Collations';
-$strCharsets = 'Charsets';
-$strCheckAll = 'Check All';
-$strCheck = 'Check';
-$strCheckOverhead = 'Check tables having overhead';
-$strCheckPrivs = 'Check Privileges';
-$strCheckPrivsLong = 'Check privileges for database "%s".';
-$strCheckTable = 'Check table';
-$strChoosePage = 'Please choose a page to edit';
 $strColComFeat = 'Displaying Column Comments';
 $strCollation = 'Collation';
 $strColumnNames = 'Column names';
@@ -201,6 +181,26 @@ $strCustomColor = 'Custom color';
 $strCyrillic = 'Cyrillic';
 $strCzech = 'Czech';
 $strCzechSlovak = 'Czech-Slovak';
+$strChangeCopyModeCopy = '... keep the old one.';
+$strChangeCopyMode = 'Create a new user with the same privileges and ...';
+$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';
+$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';
+$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';
+$strChangeCopyUser = 'Change Login Information / Copy User';
+$strChangeDisplay = 'Choose field to display';
+$strChange = 'Change';
+$strChangePassword = 'Change password';
+$strCharset = 'Charset';
+$strCharsetOfFile = 'Character set of the file:';
+$strCharsetsAndCollations = 'Character Sets and Collations';
+$strCharsets = 'Charsets';
+$strCheckAll = 'Check All';
+$strCheck = 'Check';
+$strCheckOverhead = 'Check tables having overhead';
+$strCheckPrivs = 'Check Privileges';
+$strCheckPrivsLong = 'Check privileges for database "%s".';
+$strCheckTable = 'Check table';
+$strChoosePage = 'Please choose a page to edit';
 
 $strDanish = 'Danish';
 $strDatabase = 'Database';
@@ -434,7 +434,6 @@ $strKorean = 'Korean';
 $strLandscape = 'Landscape';
 $strLanguage = 'Language';
 $strLanguageUnknown = 'Unknown language: %1$s.';
-$strLatchedPages = 'Latched pages';
 $strLatexCaption = 'Table caption';
 $strLatexContent = 'Content of table __TABLE__';
 $strLatexContinuedCaption = 'Continued table caption';
@@ -443,6 +442,7 @@ $strLatexIncludeCaption = 'Include table caption';
 $strLatexLabel = 'Label key';
 $strLaTeX = 'LaTeX';
 $strLatexStructure = 'Structure of table __TABLE__';
+$strLatchedPages = 'Latched pages';
 $strLatvian = 'Latvian';
 $strLDI = 'CSV using LOAD DATA';
 $strLDILocal = 'Use LOCAL keyword';
@@ -458,6 +458,7 @@ $strLoginInformation = 'Login Information';
 $strLogin = 'Log in';
 $strLogout = 'Log out';
 $strLogPassword = 'Password:';
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';
 $strLogServer = 'Server:';
 $strLogUsername = 'Username:';
 $strLongOperation = 'This operation could take a long time. Proceed anyway?';
@@ -498,9 +499,9 @@ $strMyISAMRepairThreadsDesc = 'If this value is greater than 1, MyISAM table ind
 $strMyISAMRepairThreads = 'Repair threads';
 $strMyISAMSortBufferSizeDesc = 'The buffer that is allocated when sorting MyISAM indexes during a REPAIR TABLE or when creating indexes with CREATE INDEX or ALTER TABLE.';
 $strMyISAMSortBufferSize = 'Sort buffer size';
-$strMySQLCharset = 'MySQL charset';
 $strMysqlClientVersion = 'MySQL client version';
 $strMySQLConnectionCollation = 'MySQL connection collation';
+$strMySQLCharset = 'MySQL charset';
 $strMysqlLibDiffersServerVersion = 'Your PHP MySQL library version %s differs from your MySQL server version %s. This may cause unpredictable behavior.';
 $strMySQLSaid = 'MySQL said: ';
 $strMySQLShowProcess = 'Show processes';
@@ -567,19 +568,19 @@ $strPartitionDefinition = 'PARTITION definition';
 $strPartitioned = 'partitioned';
 $strPartitionMaintenance = 'Partition maintenance';
 $strPartition = 'Partition %s';
-$strPasswordChanged = 'The password for %s was changed successfully.';
 $strPasswordEmpty = 'The password is empty!';
 $strPasswordHashing = 'Password Hashing';
+$strPasswordChanged = 'The password for %s was changed successfully.';
 $strPasswordNotSame = 'The passwords aren\'t the same!';
 $strPassword = 'Password';
-$strPBXTCheckpointFrequency = 'Checkpoint frequency';
-$strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.';
 $strPBXTDataFileGrowSize = 'Data file grow size';
 $strPBXTDataFileGrowSizeDesc = 'The grow size of the handle data (.xtd) files.';
 $strPBXTDataLogThreshold = 'Data log threshold';
 $strPBXTDataLogThresholdDesc = 'The maximum size of a data log file. The default value is 64MB. PBXT can create a maximum of 32000 data logs, which are used by all tables. So the value of this variable can be increased to increase the total amount of data that can be stored in the database.';
 $strPBXTGarbageThresholdDesc = 'The percentage of garbage in a data log file before it is compacted. This is a value between 1 and 99. The default is 50.';
 $strPBXTGarbageThreshold = 'Garbage threshold';
+$strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.';
+$strPBXTCheckpointFrequency = 'Checkpoint frequency';
 $strPBXTIndexCacheSizeDesc = 'This is the amount of memory allocated to the index cache. Default value is 32MB. The memory allocated here is used only for caching index pages.';
 $strPBXTIndexCacheSize = 'Index cache size';
 $strPBXTLogBufferSizeDesc = 'The size of the buffer used when writing a data log. The default is 256MB. The engine allocates one buffer pre thread, but only if the thread is required to write a data log.';
@@ -638,8 +639,8 @@ $strPrivDescDelete = 'Allows deleting data.';
 $strPrivDescDropDb = 'Allows dropping databases and tables.';
 $strPrivDescDropTbl = 'Allows dropping tables.';
 $strPrivDescEvent = 'Allows to set up events for the event scheduler';
-$strPrivDescExecute5 = 'Allows executing stored routines.';
 $strPrivDescExecute = 'Allows running stored procedures; has no effect in this MySQL version.';
+$strPrivDescExecute5 = 'Allows executing stored routines.';
 $strPrivDescFile = 'Allows importing data from and exporting data into files.';
 $strPrivDescGrant = 'Allows adding users and privileges without reloading the privilege tables.';
 $strPrivDescIndex = 'Allows creating and dropping indexes.';
@@ -885,8 +886,8 @@ $strShowStatusReset = 'Reset';
 $strShowStatusRpl_statusDescr = 'The status of failsafe replication (not yet implemented).';
 $strShowStatusSelect_full_joinDescr = 'The number of joins that do not use indexes. If this value is not 0, you should carefully check the indexes of your tables.';
 $strShowStatusSelect_full_range_joinDescr = 'The number of joins that used a range search on a reference table.';
-$strShowStatusSelect_range_checkDescr = 'The number of joins without keys that check for key usage after each row. (If this is not 0, you should carefully check the indexes of your tables.)';
 $strShowStatusSelect_rangeDescr = 'The number of joins that used ranges on the first table. (It\'s normally not critical even if this is big.)';
+$strShowStatusSelect_range_checkDescr = 'The number of joins without keys that check for key usage after each row. (If this is not 0, you should carefully check the indexes of your tables.)';
 $strShowStatusSelect_scanDescr = 'The number of joins that did a full scan of the first table.';
 $strShowStatusSlave_open_temp_tablesDescr = 'The number of temporary tables currently open by the slave SQL thread.';
 $strShowStatusSlave_retried_transactionsDescr = 'Total (since startup) number of times the replication slave SQL thread has retried transactions.';
@@ -932,9 +933,9 @@ $strSQPBugInvalidIdentifer = 'Invalid Identifer';
 $strSQPBugUnclosedQuote = 'Unclosed quote';
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';
 $strStandInStructureForView = 'Stand-in structure for view';
-$strStatCheckTime = 'Last check';
 $strStatCreateTime = 'Creation';
 $strStatement = 'Statements';
+$strStatCheckTime = 'Last check';
 $strStatisticsOverrun = 'On a busy server, the byte counters may overrun, so those statistics as reported by the MySQL server may be incorrect.';
 $strStatUpdateTime = 'Last update';
 $strStatus = 'Status';
diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php
index ce943c3e9..680fb3672 100644
--- a/lang/estonian-utf-8.inc.php
+++ b/lang/estonian-utf-8.inc.php
@@ -1099,4 +1099,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php
index 6e7d97206..c8972e1d0 100644
--- a/lang/finnish-utf-8.inc.php
+++ b/lang/finnish-utf-8.inc.php
@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php
index 7975af3be..2b1771c14 100644
--- a/lang/french-utf-8.inc.php
+++ b/lang/french-utf-8.inc.php
@@ -1090,4 +1090,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php
index 6db1e8408..2890166db 100644
--- a/lang/galician-utf-8.inc.php
+++ b/lang/galician-utf-8.inc.php
@@ -1092,4 +1092,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php
index 59b77e803..ef143e3ce 100644
--- a/lang/georgian-utf-8.inc.php
+++ b/lang/georgian-utf-8.inc.php
@@ -1119,4 +1119,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php
index 3e209dbf6..2b884a71f 100644
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -1099,4 +1099,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php
index 1b321ffd1..e46614eaf 100644
--- a/lang/greek-utf-8.inc.php
+++ b/lang/greek-utf-8.inc.php
@@ -1116,4 +1116,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php
index d8a956fc8..91f106cbf 100644
--- a/lang/hebrew-utf-8.inc.php
+++ b/lang/hebrew-utf-8.inc.php
@@ -1111,4 +1111,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php
index 87f414960..f2ffea3d6 100644
--- a/lang/hindi-utf-8.inc.php
+++ b/lang/hindi-utf-8.inc.php
@@ -1119,4 +1119,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php
index 1ac1848a1..f0418a881 100644
--- a/lang/hungarian-utf-8.inc.php
+++ b/lang/hungarian-utf-8.inc.php
@@ -1110,4 +1110,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php
index e4faab236..bf1745d0b 100644
--- a/lang/indonesian-utf-8.inc.php
+++ b/lang/indonesian-utf-8.inc.php
@@ -1109,4 +1109,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php
index bf07fb0a1..cb2b54659 100644
--- a/lang/italian-utf-8.inc.php
+++ b/lang/italian-utf-8.inc.php
@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php
index e1bfd63d2..492223c5e 100644
--- a/lang/japanese-utf-8.inc.php
+++ b/lang/japanese-utf-8.inc.php
@@ -1110,4 +1110,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php
index ce75dbeb9..74016e377 100644
--- a/lang/korean-utf-8.inc.php
+++ b/lang/korean-utf-8.inc.php
@@ -1114,4 +1114,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php
index 321389d47..0842e3b93 100644
--- a/lang/latvian-utf-8.inc.php
+++ b/lang/latvian-utf-8.inc.php
@@ -1116,4 +1116,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php
index 66b264b5e..56cdb2eb3 100644
--- a/lang/lithuanian-utf-8.inc.php
+++ b/lang/lithuanian-utf-8.inc.php
@@ -1109,4 +1109,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php
index 2fd8a1492..2569a5348 100644
--- a/lang/macedonian_cyrillic-utf-8.inc.php
+++ b/lang/macedonian_cyrillic-utf-8.inc.php
@@ -1094,4 +1094,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php
index f82c95573..b06537e82 100644
--- a/lang/malay-utf-8.inc.php
+++ b/lang/malay-utf-8.inc.php
@@ -1131,4 +1131,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php
index 771d535f8..6231c42b6 100644
--- a/lang/mongolian-utf-8.inc.php
+++ b/lang/mongolian-utf-8.inc.php
@@ -1114,4 +1114,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php
index 8ea910979..78804b6df 100644
--- a/lang/norwegian-utf-8.inc.php
+++ b/lang/norwegian-utf-8.inc.php
@@ -1091,4 +1091,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php
index 787eae5ff..7b86d51c4 100644
--- a/lang/persian-utf-8.inc.php
+++ b/lang/persian-utf-8.inc.php
@@ -1116,4 +1116,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php
index 70b683c8f..ad1e6e741 100644
--- a/lang/polish-utf-8.inc.php
+++ b/lang/polish-utf-8.inc.php
@@ -1087,4 +1087,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php
index 7d7a7f319..33202119f 100644
--- a/lang/portuguese-utf-8.inc.php
+++ b/lang/portuguese-utf-8.inc.php
@@ -1120,4 +1120,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php
index db5e50f14..9b5cb3b23 100644
--- a/lang/romanian-utf-8.inc.php
+++ b/lang/romanian-utf-8.inc.php
@@ -1108,4 +1108,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php
index 65b52f0d4..f1361b318 100644
--- a/lang/russian-utf-8.inc.php
+++ b/lang/russian-utf-8.inc.php
@@ -1095,4 +1095,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php
index 4d7ad739e..07f1fe012 100644
--- a/lang/serbian_cyrillic-utf-8.inc.php
+++ b/lang/serbian_cyrillic-utf-8.inc.php
@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php
index c1c46758e..fb028f9f4 100644
--- a/lang/serbian_latin-utf-8.inc.php
+++ b/lang/serbian_latin-utf-8.inc.php
@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php
index 757f3db48..76c445199 100644
--- a/lang/sinhala-utf-8.inc.php
+++ b/lang/sinhala-utf-8.inc.php
@@ -1096,4 +1096,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php
index 219ba0cf5..e6571a1e6 100644
--- a/lang/slovak-utf-8.inc.php
+++ b/lang/slovak-utf-8.inc.php
@@ -1094,4 +1094,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php
index 63f73a49e..233abe93d 100644
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -1113,4 +1113,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php
index 68e15fb28..845ee89ac 100644
--- a/lang/spanish-utf-8.inc.php
+++ b/lang/spanish-utf-8.inc.php
@@ -1089,4 +1089,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php
index a6484cb3b..24989baf1 100644
--- a/lang/swedish-utf-8.inc.php
+++ b/lang/swedish-utf-8.inc.php
@@ -1091,4 +1091,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php
index 85fe62044..c743cfb09 100644
--- a/lang/tatarish-utf-8.inc.php
+++ b/lang/tatarish-utf-8.inc.php
@@ -1105,4 +1105,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php
index 892285962..e2d7cfa86 100644
--- a/lang/thai-utf-8.inc.php
+++ b/lang/thai-utf-8.inc.php
@@ -1115,4 +1115,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php
index b50b7d280..1b7483ccc 100644
--- a/lang/turkish-utf-8.inc.php
+++ b/lang/turkish-utf-8.inc.php
@@ -1099,4 +1099,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php
index 33b3ecec6..6dce706a3 100644
--- a/lang/ukrainian-utf-8.inc.php
+++ b/lang/ukrainian-utf-8.inc.php
@@ -1113,4 +1113,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 9738d76c7..d79f533a3 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -262,8 +262,8 @@ if (top != self) {
 
 <?php if ($GLOBALS['cfg']['AllowArbitraryServer']) { ?>
         <div class="item">
-            <label for="input_servername"><?php echo $GLOBALS['strLogServer']; ?></label>
-            <input type="text" name="pma_servername" id="input_servername" value="<?php echo htmlspecialchars($default_server); ?>" size="24" class="textfield" />
+            <label for="input_servername" title="<?php echo $GLOBALS['strLogServerHelp']; ?>"><?php echo $GLOBALS['strLogServer']; ?></label>
+            <input type="text" name="pma_servername" id="input_servername" value="<?php echo htmlspecialchars($default_server); ?>" size="24" class="textfield" title="<?php echo $GLOBALS['strLogServerHelp']; ?>" />
         </div>
 <?php } ?>
         <div class="item">
@@ -548,9 +548,22 @@ function PMA_auth_set_user()
     } // end if
 
     if ($GLOBALS['cfg']['AllowArbitraryServer']
-     && ! empty($GLOBALS['pma_auth_server'])
-     && $cfg['Server']['host'] != $GLOBALS['pma_auth_server']) {
-        $cfg['Server']['host'] = $GLOBALS['pma_auth_server'];
+     && ! empty($GLOBALS['pma_auth_server'])) {
+        /* Allow to specify 'host port' */
+        $parts = explode(' ', $GLOBALS['pma_auth_server']);
+        if (count($parts) == 2) {
+            $tmp_host = $parts[0];
+            $tmp_port = $parts[1];
+        } else {
+            $tmp_host = $GLOBALS['pma_auth_server'];
+            $tmp_port = '';
+        }
+        if ($cfg['Server']['host'] != $GLOBALS['pma_auth_server']) {
+            $cfg['Server']['host'] = $tmp_host;
+            if (!empty($tmp_port)) {
+                $cfg['Server']['port'] = $tmp_port;
+            }
+        }
     }
     $cfg['Server']['user']     = $GLOBALS['PHP_AUTH_USER'];
     $cfg['Server']['password'] = $GLOBALS['PHP_AUTH_PW'];