diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 46af89c06179dc6ee05b1ce09c35fd435a223786..a7d30c0916c5aeee5b3cbe64c91489cb1d5f245a 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -27,6 +27,7 @@
       <inputFormat>dd.MM.yyyy</inputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/Activity_entity/entityfields/entrydate/onValidation.js</onValidation>
     </entityField>
     <entityField>
       <name>ACTIVITYID</name>
diff --git a/entity/Activity_entity/entityfields/entrydate/onValidation.js b/entity/Activity_entity/entityfields/entrydate/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..63235b240b7df91d447c5f2f5a2cc371c51f4c23
--- /dev/null
+++ b/entity/Activity_entity/entityfields/entrydate/onValidation.js
@@ -0,0 +1,9 @@
+import("system.datetime");
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("Entity_lib");
+
+var entryDate = ProcessHandlingUtils.getOnValidationValue();
+if (Number(datetime.clearTime(entryDate)) > Number(vars.get("$sys.today")))
+    result.string(translate.text("Entrydate must not be in the future"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 1c89a7f9d0dfa826b7d9d31caba003c4c2a12316..03c9d73fbd9d0bdb3008dabb00835ccde35ba25b 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -3831,6 +3831,9 @@
     <entry>
       <key>Write email</key>
     </entry>
+    <entry>
+      <key>Show tasks where I am editor</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index df756b30ab275a719e43d5fbdd368cd671f636c4..4682197cfd41e984d35686f2475c05e9ff9586b4 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1594,6 +1594,10 @@
       <key>Sent receipts</key>
       <value>Versendete Belege</value>
     </entry>
+    <entry>
+      <key>Entrydate must not be in the future</key>
+      <value>Eingangsdatum darf nicht in der Zukunft liegen</value>
+    </entry>
     <entry>
       <key>Copy receipt</key>
       <value>Beleg kopieren</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 85bd641cdb5a6b979901e69004beeef6017c75d6..9590dc08a9fa13e5659487c00e5f3621bf3abd91 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -3883,6 +3883,9 @@
     <entry>
       <key>Write email</key>
     </entry>
+    <entry>
+      <key>Show tasks where I am editor</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>