diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/PlatformSecurityContext.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/PlatformSecurityContext.java
index 4e0053c78..3e6f98d60 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/PlatformSecurityContext.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/PlatformSecurityContext.java
@@ -13,5 +13,5 @@ public interface PlatformSecurityContext {
 
     void validateAccessRights(String resourceOfficeHierarchy);
 
-    String officeHierarcy();
+    String OfficeHierarchy();
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java
index 5e732562c..56b53baef 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java
@@ -48,7 +48,7 @@ public class SpringSecurityPlatformSecurityContext implements PlatformSecurityCo
     }
 
     @Override
-    public String officeHierarcy() {
+    public String OfficeHierarchy() {
         return authenticatedUser().getOffice().getHierarchy();
     }
 }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java
index 01b1f8eea..ad2c2921a 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java
@@ -93,13 +93,13 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
     @Override
     public Page<ClientData> retrieveAll(final SearchParameters searchParameters) {
 
-        final String hierarchy = this.context.officeHierarcy();
-        String hierarchySearchString = hierarchy + "%";
+        final String userOfficeHierarchy = this.context.OfficeHierarchy();
+        final String underHierarchySearchString = userOfficeHierarchy + "%";
 
-        if (searchParameters.isScopedByOfficeHierarchy()) {
-            this.context.validateAccessRights(searchParameters.getHierarchy());
-            hierarchySearchString = searchParameters.getHierarchy();
-        }
+//        if (searchParameters.isScopedByOfficeHierarchy()) {
+//            this.context.validateAccessRights(searchParameters.getHierarchy());
+//            underHierarchySearchString = searchParameters.getHierarchy() + "%";
+//        }
 
         final StringBuilder sqlBuilder = new StringBuilder(200);
         sqlBuilder.append("select SQL_CALC_FOUND_ROWS ");
@@ -129,7 +129,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
 
         final String sqlCountRows = "SELECT FOUND_ROWS()";
         return this.paginationHelper.fetchPage(this.jdbcTemplate, sqlCountRows, sqlBuilder.toString(), new Object[] {
-                hierarchySearchString, hierarchySearchString }, this.clientMapper);
+                underHierarchySearchString, underHierarchySearchString }, this.clientMapper);
     }
 
     private String buildSqlStringFromClientCriteria(final SearchParameters searchParameters) {