diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
index 7f1463ce7d..a70c0f9b73 100644
--- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
@@ -476,7 +476,11 @@ private long getUsers(boolean computeDeletes) throws Throwable {
                 deltaSyncUserTimeStamp = dateFormat.format(new Date(0));
             }
 
-            extendedUserSearchFilter = "(objectclass=" + userObjectClass + ")(|(uSNChanged>=" + deltaSyncUserTime + ")(modifyTimestamp>=" + deltaSyncUserTimeStamp + "Z))";
+            if (config.isDeltaSyncEnabled()) {
+                extendedUserSearchFilter = "(objectclass=" + userObjectClass + ")(|(uSNChanged>=" + deltaSyncUserTime + ")(modifyTimestamp>=" + deltaSyncUserTimeStamp + "Z))";
+            } else {
+                extendedUserSearchFilter = "(objectclass=" + userObjectClass + ")";
+            }
 
             if (userSearchFilter != null && !userSearchFilter.trim().isEmpty()) {
                 String customFilter = userSearchFilter.trim();
@@ -737,7 +741,11 @@ private long getGroups(boolean computeDeletes) throws Throwable {
                 deltaSyncGroupTimeStamp = dateFormat.format(new Date(0));
             }
 
-            extendedAllGroupsSearchFilter = "(&" + extendedGroupSearchFilter + "(|(uSNChanged>=" + deltaSyncGroupTime + ")(modifyTimestamp>=" + deltaSyncGroupTimeStamp + "Z)))";
+            if (config.isDeltaSyncEnabled()) {
+                extendedAllGroupsSearchFilter = "(&"  + extendedGroupSearchFilter + "(|(uSNChanged>=" + deltaSyncGroupTime + ")(modifyTimestamp>=" + deltaSyncGroupTimeStamp + "Z)))";
+            } else {
+                extendedAllGroupsSearchFilter = "(&"  + extendedGroupSearchFilter + ")";
+            }
 
             LOG.info("extendedAllGroupsSearchFilter = {}", extendedAllGroupsSearchFilter);
 
diff --git a/unixauthservice/scripts/setup.py b/unixauthservice/scripts/setup.py
index e219b5e21c..9a66060523 100755
--- a/unixauthservice/scripts/setup.py
+++ b/unixauthservice/scripts/setup.py
@@ -256,7 +256,8 @@ def convertInstallPropsToXML(props):
             #	if (key.startswith("ranger.usersync.ldap") or key.startswith("ranger.usersync.group") or key.startswith("ranger.usersync.paged")):
             #		del ret[key]
         elif (syncSource == SYNC_SOURCE_LDAP):
-            ret['ranger.usersync.ldap.deltasync'] = "true"
+            if ('ranger.usersync.ldap.deltasync' not in ret or len(str(ret['ranger.usersync.ldap.deltasync'])) == 0):
+                ret['ranger.usersync.ldap.deltasync'] = "true"
             ldapPass = ret[SYNC_LDAP_BIND_PASSWORD_KEY]
             password_validation(ldapPass, SYNC_LDAP_BIND_PASSWORD_KEY)
             ret['ranger.usersync.source.impl.class'] = 'org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder'