diff --git a/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js b/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js
index 6894cffbcb87cde03310b7719d9c3c5e01ba666a..f46eabe6e8b9982d38498d4ec9293f71ad377520 100644
--- a/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js
+++ b/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js
@@ -2,8 +2,10 @@ import("system.logging");
 import("system.vars");
 import("system.result");
 import("system.neon");
-var orgid = vars.getString("$field.ORGID").trim();
-if(orgid == "0")
+
+var orgid = vars.getString("$field.ORGID");
+
+if((orgid == null || orgid.trim() == "0") && (vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW))
     result.string(null);
 else
-    result.string("Org_context");    
\ No newline at end of file
+    result.string("Org_context");