diff --git a/Documentation.html b/Documentation.html
index 506260526..e7358dd07 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1203,7 +1203,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         <span id="cfg_Servers_AllowDeny_order">$cfg['Servers'][$i]['AllowDeny']['order']</span> string
     </dt>
     <dd>If your rule order is empty, then <abbr title="Internet Protocol">IP</abbr>
-        authentication is disabled.<br /><br />
+        authorization is disabled.<br /><br />
 
         If your rule order is set to <tt>'deny,allow'</tt> then the system applies
         all deny rules followed by allow rules. Access is allowed by default. Any
@@ -1215,7 +1215,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         default.  Any client which does not match an Allow directive or does
         match a Deny directive will be denied access to the server.<br /><br />
 
-        If your rule order is set to 'explicit', the authentication is
+        If your rule order is set to 'explicit', authorization is
         performed in a similar fashion to rule order 'deny,allow', with the
         added restriction that your host/username combination <b>must</b> be
         listed in the <i>allow</i> rules, and not listed in the <i>deny</i>
diff --git a/js/config.js b/js/config.js
index dd18a29f1..ad4e88078 100644
--- a/js/config.js
+++ b/js/config.js
@@ -202,14 +202,11 @@ var validators = {
      * @param {boolean} isKeyUp
      */
     validate_port_number: function(isKeyUp) {
-        if (isKeyUp && this.value == '') {
+        if (this.value == '') {
             return true;
         }
         var result = validators._regexp_numeric.test(this.value) && this.value != '0';
-        if (!result || this.value > 65536) {
-            result = PMA_messages['error_incorrect_port'];
-        }
-        return result;
+        return result && this.value <= 65535 ? true : PMA_messages['error_incorrect_port'];
     },
     /**
      * Validates value according to given regular expression
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index a99092b70..b2b874c30 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -189,11 +189,11 @@ $strConfigForm_Query_window_desc = __('Customize query window options');
 $strConfigForm_Security = __('Security');
 $strConfigForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
 $strConfigForm_Server = __('Basic settings');
+$strConfigForm_Server_auth = __('Authentication');
+$strConfigForm_Server_auth_desc = __('Authentication settings');
 $strConfigForm_Server_config = __('Server configuration');
 $strConfigForm_Server_config_desc = __('Advanced server configuration, do not change these options unless you know what they are for');
 $strConfigForm_Server_desc = __('Enter server connection parameters');
-$strConfigForm_Server_login_options = __('Signon login options');
-$strConfigForm_Server_login_options_desc = __('Enter login options for signon authentication');
 $strConfigForm_Server_pmadb = __('PMA database');
 $strConfigForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
 $strConfigForm_Server_tracking = __('Changes tracking');
@@ -345,9 +345,9 @@ $strConfigRestoreDefaultValue = __('Restore default value');
 $strConfigSaveDir_desc = __('Directory where exports can be saved on server');
 $strConfigSaveDir_name = __('Save directory');
 $strConfigServers_AllowDeny_order_desc = __('Leave blank if not used');
-$strConfigServers_AllowDeny_order_name = __('Host authentication order');
+$strConfigServers_AllowDeny_order_name = __('Host authorization order');
 $strConfigServers_AllowDeny_rules_desc = __('Leave blank for defaults');
-$strConfigServers_AllowDeny_rules_name = __('Host authentication rules');
+$strConfigServers_AllowDeny_rules_name = __('Host authorization rules');
 $strConfigServers_AllowNoPassword_name = __('Allow logins without a password');
 $strConfigServers_AllowRoot_name = __('Allow root login');
 $strConfigServers_auth_http_realm_desc = __('HTTP Basic Auth Realm name to display when doing HTTP Auth');
@@ -459,7 +459,7 @@ $strConfigSQLQuery_ShowAsPHP_name = __('Create PHP Code');
 $strConfigSQLQuery_Validate_desc = __('Requires [a@#tab_Sql_validator]SQL Validator[/a] to be enabled');
 $strConfigSQLQuery_Validate_name = __('Validate SQL');
 $strConfigSQLValidator_password_name = __('Password');
-$strConfigSQLValidator_use_desc = __('[strong]Warning:[/strong] requires PEAR SOAP to be installed');
+$strConfigSQLValidator_use_desc = __('[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be installed');
 $strConfigSQLValidator_use_name = __('Enable SQL Validator');
 $strConfigSQLValidator_username_name = __('Username');
 $strConfigSQLValidator_username_desc = __('If you have a custom username, specify it here (defaults to [kbd]anonymous[/kbd])');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index de83864bc..ab150a37c 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -30,13 +30,17 @@ $forms['Servers']['Server'] = array('Servers' => array(1 => array(
     'connect_type',
     'extension',
     'compress',
-    'auth_type' => ':group',
-    'auth_http_realm',
+    'nopassword')));
+$forms['Servers']['Server_auth'] = array('Servers' => array(1 => array(
+    'auth_type',
+    ':group:' . __('Config authentication'),
     'user',
     'password',
-    'nopassword',
-    'auth_swekey_config' => './swekey.conf')));
-$forms['Servers']['Server_login_options'] = array('Servers' => array(1 => array(
+    ':group:' . __('Cookie authentication'),
+    'auth_swekey_config' => './swekey.conf',
+    ':group:' . __('HTTP authentication'),
+    'auth_http_realm',
+    ':group:' . __('Signon authentication'),
     'SignonSession',
     'SignonURL',
     'LogoutURL')));
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index 5cc252770..0a633420f 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -383,7 +383,7 @@ function test_number($path, $values, $allow_neg, $allow_zero, $max_value, $error
  */
 function validate_port_number($path, $values)
 {
-    return array($path => test_number($path, $values, false, false, 65536, __('Not a valid port number')));
+    return array($path => test_number($path, $values, false, false, 65535, __('Not a valid port number')));
 }
 
 /**