diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserAliasHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserAliasHandler.java index 307faf27314..48b89b50016 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserAliasHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserAliasHandler.java @@ -61,6 +61,9 @@ protected void setPropertiesFromExistingAliasEntity( newAliasEntity.setPasswordLastModified(existingAliasEntity.getPasswordLastModified()); newAliasEntity.setLastLogonTime(existingAliasEntity.getLastLogonTime()); newAliasEntity.setPreviousLogonTime(existingAliasEntity.getPreviousLogonTime()); + + // the version field might differ between the original user and its alias -> use value of existing alias + newAliasEntity.setVersion(existingAliasEntity.getVersion()); } private Optional> retrieveIdpByOrigin(final String originKey, final String zoneId) {