diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 2525ff9c3b4d5cc1b08803aed0223fd20e176212..1bdf8914726cb44dd4fe6a904e29622559801645 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -17,7 +17,7 @@
       <name>ORGANISATION_ID</name>
       <title>Organisation</title>
       <consumer>Organisations</consumer>
-      <mandatory v="true" />
+      <mandatory v="false" />
       <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
       <onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
diff --git a/entity/Contact_entity/entityfields/organisation_id/onValueChange.js b/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
index 0347a3d2d5b43d2b6be7a3464f03c5e61330828d..80f1e97c87383bde995515d7383b083726b7e8bf 100644
--- a/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
+++ b/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
@@ -1,4 +1,10 @@
 import("system.vars");
+import("system.neon");
 
 //since the standard address can be only values of org the standard address has to be reset on org change
-vars.set("$field.ADDRESS_ID", "");
\ No newline at end of file
+vars.set("$field.ADDRESS_ID", "");
+
+if(vars.exists("$local.value") && !vars.get("$local.value"))
+{
+    neon.setFieldValue("$field.ORGANISATION_ID", "0");
+}
diff --git a/entity/Contact_entity/entityfields/organisation_id/valueProcess.js b/entity/Contact_entity/entityfields/organisation_id/valueProcess.js
index b25ed87f4581b8db000935c6eaa1bed89529079f..008844fbe522bd43628d4ef5741d38d8c456a6ae 100644
--- a/entity/Contact_entity/entityfields/organisation_id/valueProcess.js
+++ b/entity/Contact_entity/entityfields/organisation_id/valueProcess.js
@@ -2,10 +2,7 @@ import("system.result");
 import("system.vars");
 import("system.neon");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.getString("$field.ORGANISATION_ID") == "")
 {
-    if(!vars.get("$field.ORGANISATION_ID"))
-    { 
-        result.string("0");
-    }
+    result.string("0");
 }
\ No newline at end of file