diff --git a/entity/Organisation_entity/entityfields/newvisitplanentry/onActionProcess.js b/entity/Organisation_entity/entityfields/newvisitplanentry/onActionProcess.js
index a4b75c65374cd0c2b158597b4afc565669916962..f32b45bbbf4dcad4715cdee536fa1326f7bb3ae3 100644
--- a/entity/Organisation_entity/entityfields/newvisitplanentry/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newvisitplanentry/onActionProcess.js
@@ -4,6 +4,6 @@ import("system.vars");
 var params = {};
 
 params["NoVisitPlanEmployeeWeek_param"] = true;
-params["OrganisationId_param"] = vars.get("$field.CONTACTID");
+params["ContactId_param"] = vars.get("$field.CONTACTID");
 
 neon.openContext("VisitPlanEntry", "VisitPlanEntryEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
index 357a96238802b8f34c00a088b3fd1a3415dc0ff9..52193180296057318c5efc834cf1e666c44f6359 100644
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
@@ -10,7 +10,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && (vars.get("$this.
 {
     var isPersonContact = newSelect("PERSON.PERSONID").from("PERSON")
         .join("CONTACT", "PERSON.PERSONID = CONTACT.PERSON_ID")
-        .where("CONTACT.CONTACTID", vars.get("$param.ContactId_param")).cell()
+        .whereIfSet("CONTACT.CONTACTID", vars.get("$param.ContactId_param")).cell()
 
     if(isPersonContact)
         result.string(vars.get("$param.ContactId_param"));
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
index 2b90b668563cd3c022b2e3a32c9bab71c44f1783..ac8c851516dfe3ae456dda4560390e3a13c5d39e 100644
--- a/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
@@ -4,11 +4,11 @@ import("system.result");
 import("system.vars");
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null 
-    && vars.exists("$param.OrganisationId_param") && vars.get("$param.OrganisationId_param"))
+    && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
 {
     
     var OrgId = newSelect("CONTACT.ORGANISATION_ID").from("CONTACT")
-        .where("CONTACT.CONTACTID", vars.get("$param.OrganisationId_param"))
+        .where("CONTACT.CONTACTID", vars.get("$param.ContactId_param"))
         .cell()
     
     var contactIdWithoutPerson = newSelect("CONTACT.CONTACTID").from("CONTACT")