diff --git a/docs/auth/auth-ldap-groups.rst b/docs/auth/auth-ldap-groups.rst
--- a/docs/auth/auth-ldap-groups.rst
+++ b/docs/auth/auth-ldap-groups.rst
@@ -68,7 +68,7 @@ Below is example setup that can be used 
     #  Multiple servers can be specified using commas
 
     *option*: `port` => `389`
-    # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
+    # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
 
     *option*: `timeout` => `300`
     # Timeout for LDAP connection
diff --git a/docs/auth/auth-ldap.rst b/docs/auth/auth-ldap.rst
--- a/docs/auth/auth-ldap.rst
+++ b/docs/auth/auth-ldap.rst
@@ -58,7 +58,7 @@ Below is example setup that can be used 
     #  Multiple servers can be specified using commas
 
     *option*: `port` => `389`
-    # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
+    # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
 
     *option*: `timeout` => `300`
     # Timeout for LDAP connection
diff --git a/docs/auth/ldap-active-directory.rst b/docs/auth/ldap-active-directory.rst
--- a/docs/auth/ldap-active-directory.rst
+++ b/docs/auth/ldap-active-directory.rst
@@ -22,7 +22,7 @@ authentication::
     #  Multiple servers can be specified using commas
 
     *option*: `port` => `389`
-    # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
+    # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
 
     *option*: `timeout` => `300`
     # Timeout for LDAP connection
diff --git a/rhodecode/authentication/plugins/auth_ldap.py b/rhodecode/authentication/plugins/auth_ldap.py
--- a/rhodecode/authentication/plugins/auth_ldap.py
+++ b/rhodecode/authentication/plugins/auth_ldap.py
@@ -85,7 +85,7 @@ class AuthLdap(AuthLdapBase):
         self.TLS_KIND = tls_kind
 
         if self.TLS_KIND == 'LDAPS':
-            port = port or 689
+            port = port or 636
             self.ldap_server_type += 's'
 
         OPT_X_TLS_DEMAND = 2
@@ -249,7 +249,7 @@ class LdapSettingsSchema(AuthnPluginSett
         colander.Int(),
         default=389,
         description=_('Custom port that the LDAP server is listening on. '
-                      'Default value is: 389, use 689 for LDAPS (SSL)'),
+                      'Default value is: 389, use 636 for LDAPS (SSL)'),
         preparer=strip_whitespace,
         title=_('Port'),
         validator=colander.Range(min=0, max=65536),