diff --git a/ext/scimv2/logic/pom.xml b/ext/scimv2/logic/pom.xml
index 005de7a8f2..376fd48ffb 100644
--- a/ext/scimv2/logic/pom.xml
+++ b/ext/scimv2/logic/pom.xml
@@ -62,18 +62,11 @@ under the License.
       <artifactId>antlr4-runtime</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
diff --git a/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/SCIMDataBinder.java b/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/SCIMDataBinder.java
index ec1cd898bb..d657a0b7a6 100644
--- a/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/SCIMDataBinder.java
+++ b/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/SCIMDataBinder.java
@@ -819,11 +819,7 @@ public Pair<UserUR, StatusR> toUserUpdate(final UserTO before, final SCIMPatchOp
                     // Workaround for Microsoft Entra being not SCIM compliant on PATCH requests
                     if (op.getValue().get(0) instanceof String) {
                         String a = (String) op.getValue().get(0);
-                        if (a.equalsIgnoreCase("true")) {
-                            op.setValue(List.of(true));
-                        } else if (a.equalsIgnoreCase("false")) {
-                            op.setValue(List.of(false));
-                        }
+                        op.setValue(List.of(BooleanUtils.toBoolean(a)));
                     }
 
                     statusR = new StatusR.Builder(