diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 534b7fb94f0bfb0741d093cdf1da779e1237b535..edf87292d48d6dedf17879de7994e5e9ceec6ca8 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -95,6 +95,10 @@
           <name>DefaultAddressId_param</name>
           <expose v="true" />
         </entityParameter>
+        <entityParameter>
+          <name>OrganisationId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityParameter>
@@ -169,6 +173,10 @@
           <expose v="false" />
           <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
         </entityParameter>
+        <entityParameter>
+          <name>OrganisationId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
@@ -230,7 +238,7 @@
     </entityProvider>
     <entityParameter>
       <name>OrganisationId_param</name>
-      <expose v="false" />
+      <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
   </entityFields>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 2663d337825106559f7540d12b5c6ea4b6dbe1dd..98bd95f722c1265a081d296fd902745a47d090f0 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -664,9 +664,11 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
       <children>
         <entityParameter>
           <name>OrganisationId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/valueProcess.js</valueProcess>
         </entityParameter>
         <entityParameter>
           <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/contactandorganisationaddresses/children/contactid_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/Person_entity/entityfields/contactandorganisationaddresses/children/contactid_param/code.js b/entity/Person_entity/entityfields/contactandorganisationaddresses/children/contactid_param/valueProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/contactandorganisationaddresses/children/contactid_param/code.js
rename to entity/Person_entity/entityfields/contactandorganisationaddresses/children/contactid_param/valueProcess.js
diff --git a/entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/code.js b/entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/valueProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/code.js
rename to entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/valueProcess.js
diff --git a/entity/Person_entity/entityfields/organisation_id/valueProcess.js b/entity/Person_entity/entityfields/organisation_id/valueProcess.js
index 1f81227b46042deb97b753d690b3d27aaae562f8..b570e1812595b86a3ff3891033814fda2f66fdaa 100644
--- a/entity/Person_entity/entityfields/organisation_id/valueProcess.js
+++ b/entity/Person_entity/entityfields/organisation_id/valueProcess.js
@@ -1,11 +1,15 @@
 import("system.result");
 import("system.vars");
+import("system.neon");
 
-if (vars.exists("$param.OrgId_param") && vars.get("$param.OrgId_param") != null) 
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
 {
-    result.string(vars.get("$param.OrgId_param"));
-}
-else if(!vars.get("$field.ORGANISATION_ID"))
-{ 
-    result.string("0")
-}
+    if (vars.exists("$param.OrgId_param") && vars.get("$param.OrgId_param") != null) 
+    {
+        result.string(vars.get("$param.OrgId_param"));
+    }
+    else if(!vars.get("$field.ORGANISATION_ID"))
+    { 
+        result.string("0")
+    }
+}
\ No newline at end of file