diff --git a/src/main/java/de/ozgcloud/admin/settings/DataRestConfiguration.java b/src/main/java/de/ozgcloud/admin/settings/DataRestConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c5d282338be512a5a0397f0950d30935e513dcf
--- /dev/null
+++ b/src/main/java/de/ozgcloud/admin/settings/DataRestConfiguration.java
@@ -0,0 +1,18 @@
+package de.ozgcloud.admin.settings;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.rest.core.event.ValidatingRepositoryEventListener;
+import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer;
+
+@Configuration
+public class DataRestConfiguration implements RepositoryRestConfigurer {
+	@Autowired
+	private SettingsValidator settingsValidator;
+
+	@Override
+	public void configureValidatingRepositoryEventListener(ValidatingRepositoryEventListener v) {
+		v.addValidator("beforeSave", settingsValidator);
+		v.addValidator("beforeCreate", settingsValidator);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/de/ozgcloud/admin/settings/ValidatorEventRegister.java b/src/main/java/de/ozgcloud/admin/settings/ValidatorEventRegister.java
deleted file mode 100644
index 914a721bd9ad01dfad08f726e473625e54e559ba..0000000000000000000000000000000000000000
--- a/src/main/java/de/ozgcloud/admin/settings/ValidatorEventRegister.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.ozgcloud.admin.settings;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.rest.core.event.ValidatingRepositoryEventListener;
-import org.springframework.validation.Validator;
-
-@Configuration
-public class ValidatorEventRegister implements InitializingBean {
-
-	@Autowired
-	ValidatingRepositoryEventListener validatingRepositoryEventListener;
-
-	@Autowired
-	private Map<String, Validator> validators;
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		validatingRepositoryEventListener.addValidator("beforeSave", validators.get("settingsValidator"));
-		validatingRepositoryEventListener.addValidator("beforeCreate", validators.get("settingsValidator"));
-	}
-}
\ No newline at end of file