diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 89c670999ff5c5e826b9e826dbee7d2e88f58219..a3db57c44e41293a4f2cb1fd91420d5177c77757 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -152,7 +152,7 @@
     <entityField>
       <name>ORG_ID</name>
       <title>Firma</title>
-      <linkedContext>Org_context</linkedContext>
+      <linkedContextProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/linkedContextProcess.js</linkedContextProcess>
       <mandatory v="true" />
       <outgoingField>PersOrg_dfo</outgoingField>
       <searchable v="false" />
diff --git a/entity/Pers_entity/entityfields/org_id/linkedContextProcess.js b/entity/Pers_entity/entityfields/org_id/linkedContextProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5ac9b06e2cecd0de1d1cfb0f0728df2e6d97eeb4
--- /dev/null
+++ b/entity/Pers_entity/entityfields/org_id/linkedContextProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if(vars.getString("$field.ORG_ID") != 0)
+    result.string("Org_context");
\ No newline at end of file