diff --git a/Server/conf/oxauth-config.json b/Server/conf/oxauth-config.json
index 8bcf462a42..5de0650668 100644
--- a/Server/conf/oxauth-config.json
+++ b/Server/conf/oxauth-config.json
@@ -200,8 +200,8 @@
     "clientAuthenticationFilters":[
         {
             "filter":"myCustomAttr1={0}",
-            "bind":"${config.oxauth.authentication.filter.bindDn}",
-            "bindPasswordAttribute":"${config.oxauth.authentication.filter.bindPassword}",
+            "bind":false,
+            "bindPasswordAttribute":"oxAuthClientSecret",
             "baseDn":"ou=clients,o=${config.oxauth.organization},o=gluu"
         }
     ],
diff --git a/Server/src/main/java/org/xdi/oxauth/token/ws/rs/TokenRestWebServiceImpl.java b/Server/src/main/java/org/xdi/oxauth/token/ws/rs/TokenRestWebServiceImpl.java
index 7ac01fa83e..a7532365ff 100644
--- a/Server/src/main/java/org/xdi/oxauth/token/ws/rs/TokenRestWebServiceImpl.java
+++ b/Server/src/main/java/org/xdi/oxauth/token/ws/rs/TokenRestWebServiceImpl.java
@@ -207,10 +207,10 @@ public Response requestAccessToken(String grantType, String code,
                             scope,
                             idToken));
                 } else if (gt == GrantType.RESOURCE_OWNER_PASSWORD_CREDENTIALS) {
-//    				if (client == null) {
-//    					return sendResponse(error(401, TokenErrorResponseType.INVALID_CLIENT));
-//    				}
-//
+    				if (client == null) {
+    					return sendResponse(error(401, TokenErrorResponseType.INVALID_CLIENT));
+    				}
+
                     User user = null;
                     if (authenticationFilterService.isEnabled()) {
                         String userDn = authenticationFilterService.processAuthenticationFilters(request.getParameterMap());