diff --git a/CHANGELOG.md b/CHANGELOG.md
index a93ad9492..2d8bc6fe5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 All notable changes to this project will be documented in this file.
+## [10.17.1]
+### Added
+- Fixed the order of the parameters in the method removePermissionsForUser in AccessGroupService
 
 ## [10.17.0]
 ### Changed
diff --git a/stream-access-control/access-control-core/src/main/java/com/backbase/stream/service/AccessGroupService.java b/stream-access-control/access-control-core/src/main/java/com/backbase/stream/service/AccessGroupService.java
index 65845868a..d30a2f4a9 100644
--- a/stream-access-control/access-control-core/src/main/java/com/backbase/stream/service/AccessGroupService.java
+++ b/stream-access-control/access-control-core/src/main/java/com/backbase/stream/service/AccessGroupService.java
@@ -560,7 +560,7 @@ public Mono<JobProfileUser> assignPermissions(StreamTask streamTask, ServiceAgre
         String serviceAgreementId = serviceAgreement.getInternalId();
         String userId = jobProfileUser.getUser().getInternalId();
 
-        return assignPermissionsServiceApi.putUserPermissions(serviceAgreementId, userId, functionGroups)
+        return assignPermissionsServiceApi.putUserPermissions(userId, serviceAgreementId, functionGroups)
             .onErrorResume(WebClientResponseException.class, e -> {
                 streamTask.error(ACCESS_GROUP, "assign-permissions", "failed", serviceAgreement.getExternalId(),
                     serviceAgreementId, e, e.getResponseBodyAsString(), "Failed to to assign permissions");
@@ -1292,9 +1292,9 @@ public Mono<Void> removePermissionsForUser(String serviceAgreementInternalId, St
         log.debug("Removing permissions from all Data Groups for user: {} in service agreement {}", userInternalId,
             serviceAgreementInternalId);
         return assignPermissionsServiceApi.putUserPermissions(
-            serviceAgreementInternalId,
-            userInternalId,
-            List.of());
+                userInternalId,
+                serviceAgreementInternalId,
+                List.of());
     }
 
     /**
diff --git a/stream-access-control/access-control-core/src/test/java/com/backbase/stream/service/AccessGroupServiceTest.java b/stream-access-control/access-control-core/src/test/java/com/backbase/stream/service/AccessGroupServiceTest.java
index 4bef4289a..afdab203e 100644
--- a/stream-access-control/access-control-core/src/test/java/com/backbase/stream/service/AccessGroupServiceTest.java
+++ b/stream-access-control/access-control-core/src/test/java/com/backbase/stream/service/AccessGroupServiceTest.java
@@ -2107,8 +2107,8 @@ void shouldCreateDataGroup() {
     @Test
     void shouldRemoveUserPermissions() {
         when(assignPermissionsServiceApi.putUserPermissions(any(), any(), any())).thenReturn(Mono.empty());
-        subject.removePermissionsForUser("sa-id", "user-id").block();
-        verify(assignPermissionsServiceApi).putUserPermissions("sa-id", "user-id", List.of());
+        subject.removePermissionsForUser("user-id","sa-id").block();
+        verify(assignPermissionsServiceApi).putUserPermissions("user-id", "sa-id", List.of());
     }
 
     @Test