diff --git a/docs/en_US/enabling_ldap_authentication.rst b/docs/en_US/enabling_ldap_authentication.rst
index d9b802f91..534a953c6 100644
--- a/docs/en_US/enabling_ldap_authentication.rst
+++ b/docs/en_US/enabling_ldap_authentication.rst
@@ -45,10 +45,15 @@ file and modify the values for the following parameters:
    entries, you should be able to authenticate by entering ‘admin’ in the 
    *Email Address / Username* field and its corresponding password in the *Password* 
    field."
-   "LDAP_SEARCH_BASE_DN","Specifies an element of the search request that works in
-   conjunction with the LDAP search scope to define the subtree of entries that
-   should be considered when processing the search request. You can use this parameter
-   for limiting the search request to a specific group of users."
+   "LDAP_SEARCH_BASE_DN","Specifies the distinguished name (DN) for the top-most user
+   directory that you want to search. You can use this parameter for limiting the search
+   request to a specific group of users. For example, if you want to search only within
+   the Organizational Unit named sales, you can define the value for LDAP_SEARCH_BASE_DN
+   parameter as following:
+   LDAP_SEARCH_BASE_DN = ‘ou=sales,dc=example,dc=com'
+
+   This is an optional parameter. If you do not specify any value for LDAP_SEARCH_BASE_DN,
+   then the value for LDAP_BASE_DN will be considered for the same."
    "LDAP_SEARCH_FILTER","Defines the criteria to retrieve matching entries in an
    LDAP search request. For example, LDAP_SEARCH_FILTER = '(objectclass=HR)’ setting
    searches only for users having HR as their objectClass attribute."
diff --git a/web/pgadmin/authenticate/ldap.py b/web/pgadmin/authenticate/ldap.py
index 9865f119a..18ebcdcd9 100644
--- a/web/pgadmin/authenticate/ldap.py
+++ b/web/pgadmin/authenticate/ldap.py
@@ -158,7 +158,8 @@ class LDAPAuthentication(BaseAuthentication):
          search criteria."""
         try:
             search_base_dn = config.LDAP_SEARCH_BASE_DN
-            if search_base_dn is None or search_base_dn == '':
+            if search_base_dn is None or search_base_dn == '' or\
+                    search_base_dn == '<Search-Base-DN>':
                 search_base_dn = config.LDAP_BASE_DN
             self.conn.search(search_base=search_base_dn,
                              search_filter=config.LDAP_SEARCH_FILTER,