diff --git a/src/main/java/de/ozgcloud/admin/AdministrationRepositoryRestConfigurer.java b/src/main/java/de/ozgcloud/admin/AdministrationRepositoryRestConfigurer.java
index 31bcf3b864fd772838ebe1ef3555084c984af6b6..413e34e2660a44eebad1fbfd3301e7b470fea264 100644
--- a/src/main/java/de/ozgcloud/admin/AdministrationRepositoryRestConfigurer.java
+++ b/src/main/java/de/ozgcloud/admin/AdministrationRepositoryRestConfigurer.java
@@ -34,9 +34,12 @@ import de.ozgcloud.admin.common.DelegatingValidatorAdapter;
 @Configuration
 public class AdministrationRepositoryRestConfigurer implements RepositoryRestConfigurer {
 
+	private static final DelegatingValidatorAdapter DELEGATING_VALIDATOR_ADAPTER = new DelegatingValidatorAdapter(
+			Validation.buildDefaultValidatorFactory().getValidator());
+
 	@Override
 	public void configureValidatingRepositoryEventListener(ValidatingRepositoryEventListener listener) {
-		var validator = Validation.buildDefaultValidatorFactory().getValidator();
-		listener.addValidator("beforeCreate", new DelegatingValidatorAdapter(validator));
+		listener.addValidator("beforeCreate", DELEGATING_VALIDATOR_ADAPTER);
+		listener.addValidator("beforeSave", DELEGATING_VALIDATOR_ADAPTER);
 	}
 }