diff --git a/Server/src/main/java/org/xdi/oxauth/auth/AuthenticationFilter.java b/Server/src/main/java/org/xdi/oxauth/auth/AuthenticationFilter.java
index 5c7d8de0f8..4a9824a810 100644
--- a/Server/src/main/java/org/xdi/oxauth/auth/AuthenticationFilter.java
+++ b/Server/src/main/java/org/xdi/oxauth/auth/AuthenticationFilter.java
@@ -248,6 +248,8 @@ private void processPostAuth(HttpServletRequest servletRequest, HttpServletRespo
                             identity.getCredentials().setPassword(clientSecret);
 
                             requireAuth = !getAuthenticator().authenticateWebService();
+                        } else {
+                        	getAuthenticator().configureSessionClient(client);
                         }
                     }
                 }