diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java
index 9df35cf9..a52b9c79 100644
--- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java
+++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java
@@ -124,7 +124,7 @@ public class ScimGroupController {
         		new ScimSearchResult<ScimGroup>(
         				resultList,
         				orgResults.getRecords(),
-        				requestParameters.getCount(),
+        				queryModel.getPageSize(),
         				requestParameters.getStartIndex());  
         return new MappingJacksonValue(scimSearchResult);
     }
diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java
index e33c6187..d7dac81b 100644
--- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java
+++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java
@@ -117,7 +117,7 @@ public class ScimOrganizationController {
         		new ScimSearchResult<ScimOrganization>(
         				resultList,
         				orgResults.getRecords(),
-        				requestParameters.getCount(),
+        				queryModel.getPageSize(),
         				requestParameters.getStartIndex());  
         
         return new MappingJacksonValue(scimSearchResult);
diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java
index 5cda3572..fae9b1fc 100644
--- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java
+++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java
@@ -129,7 +129,7 @@ public class ScimUserController {
         		new ScimSearchResult<ScimUser>(
         				resultList,
         				orgResults.getRecords(),
-        				requestParameters.getCount(),
+        				queryModel.getPageSize(),
         				requestParameters.getStartIndex());  
         return new MappingJacksonValue(scimSearchResult);
     }
diff --git a/maxkey-lib/mybatis-jpa-extra-2.6.jar b/maxkey-lib/mybatis-jpa-extra-2.6.jar
index 5b84c467..17b0569d 100644
Binary files a/maxkey-lib/mybatis-jpa-extra-2.6.jar and b/maxkey-lib/mybatis-jpa-extra-2.6.jar differ
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java
index b1d6cf17..acb01884 100644
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java
+++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java
@@ -79,7 +79,7 @@ public class TokenEndpoint extends AbstractEndpoint {
 
 	private OAuth2RequestValidator oAuth2RequestValidator = new DefaultOAuth2RequestValidator();
 
-	private Set<HttpMethod> allowedRequestMethods = new HashSet<HttpMethod>(Arrays.asList(HttpMethod.POST));
+	private Set<HttpMethod> allowedRequestMethods = new HashSet<HttpMethod>(Arrays.asList(HttpMethod.POST,HttpMethod.GET));
 
 	/**
 	 * must use HTTP POST Method to get token