diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 7aa1787d28c96d4ebdcd2058705f775fe4b29b7a..e3c0579097bd9f648f577f45874a8b3fb0bd51fc 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -5,6 +5,7 @@
   <icon>NEON:GROUP_APPOINTMENT</icon>
   <title>Campaign Step</title>
   <contentTitleProcess>%aditoprj%/entity/CampaignStep_entity/contentTitleProcess.js</contentTitleProcess>
+  <onValidation>%aditoprj%/entity/CampaignStep_entity/onValidation.js</onValidation>
   <imageProcess>%aditoprj%/entity/CampaignStep_entity/imageProcess.js</imageProcess>
   <titlePlural>Steps</titlePlural>
   <recordContainer>db</recordContainer>
@@ -57,7 +58,6 @@
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js</valueProcess>
       <onValueChange>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/onValueChange.js</onValueChange>
-      <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/onValidation.js</onValidation>
     </entityField>
     <entityField>
       <name>DATE_END</name>
@@ -68,7 +68,6 @@
       <inputFormat>dd.MM.yyyy</inputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_end/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/date_end/onValidation.js</onValidation>
     </entityField>
     <entityField>
       <name>STATE</name>
diff --git a/entity/CampaignStep_entity/entityfields/date_end/onValidation.js b/entity/CampaignStep_entity/entityfields/date_end/onValidation.js
deleted file mode 100644
index dd820dcf23bd0949bd35a0863f55db9128ccad67..0000000000000000000000000000000000000000
--- a/entity/CampaignStep_entity/entityfields/date_end/onValidation.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Entity_lib");
-
-var cEnd = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.DATE_END"));
-
-if (DateUtils.validateBeginnBeforeEnd(vars.get("$field.DATE_START"), cEnd) === false)
-    result.string(DateUtils.getValidationFailString());
diff --git a/entity/CampaignStep_entity/entityfields/date_start/onValidation.js b/entity/CampaignStep_entity/entityfields/date_start/onValidation.js
deleted file mode 100644
index d3e654ed2da27160403c8bc98965485795c3282b..0000000000000000000000000000000000000000
--- a/entity/CampaignStep_entity/entityfields/date_start/onValidation.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Entity_lib");
-
-var cStart = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.DATE_START"));
-
-if (DateUtils.validateBeginnBeforeEnd(cStart, vars.get("$field.DATE_END")) === false)
-    result.string(DateUtils.getValidationFailString());
diff --git a/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js b/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js
index 4c1e2142a292fa2ef6fa38dbe2e458d9628af21f..db8ea5d57138bf026f3a187c65185d2ecd018478 100644
--- a/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js
@@ -6,6 +6,4 @@ import("system.result");
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
 {
     result.string(DateUtils.getTodayUTC());
-}
-else
-    result.string(vars.get("$this.value"));
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/onValidation.js b/entity/CampaignStep_entity/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..7a18bd24c20b6fc659c9bca3612a62ab1d86107e
--- /dev/null
+++ b/entity/CampaignStep_entity/onValidation.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Date_lib");
+import("system.vars");
+
+var startDate = vars.get("$field.DATE_START");
+var endDate = vars.get("$field.DATE_END");
+
+if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
+    result.string(DateUtils.getValidationFailString());