diff --git a/entity/Offer_entity/entityfields/anycontacts/children/contactids_param/valueProcess.js b/entity/Offer_entity/entityfields/anycontacts/children/contactids_param/valueProcess.js
index 64ebdd402a070cab2fb3c837720f16423cda76ec..b705ec11cfccaaef8f29c1143c3980d86f028ae2 100644
--- a/entity/Offer_entity/entityfields/anycontacts/children/contactids_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/anycontacts/children/contactids_param/valueProcess.js
@@ -1,10 +1,21 @@
 import("system.result");
 import("system.vars");
+import("Sql_lib");
 
-var contactIds = "";
-if (vars.exists("$param.ContactIds_param") && vars.get("$param.ContactIds_param")) {
+var contactIds = null;
+if(vars.exists("$param.ContactIds_param") && vars.get("$param.ContactIds_param"))
+{
     contactIds = vars.get("$param.ContactIds_param");
 }
 
-if (contactIds)
-    result.string(contactIds);
\ No newline at end of file
+if(!contactIds && vars.get("$field.CONTACT_ORG_ID"))
+{
+    var sql = newSelect("CONTACTID").from("CONTACT")
+        .where("CONTACT.ORGANISATION_ID", vars.get("$field.CONTACT_ORG_ID"));
+    contactIds = JSON.stringify(sql.arrayColumn());
+}
+
+if(contactIds)
+{
+    result.string(contactIds);
+}
diff --git a/entity/Offer_entity/entityfields/contact_id/stateProcess.js b/entity/Offer_entity/entityfields/contact_id/stateProcess.js
index 0dcccb84c7750c4743ac3fb30a625052af4e8830..e51ff93affb4e84e12bff1e0a4a0145c88fc2dd2 100644
--- a/entity/Offer_entity/entityfields/contact_id/stateProcess.js
+++ b/entity/Offer_entity/entityfields/contact_id/stateProcess.js
@@ -3,11 +3,4 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-{
-    result.string(neon.COMPONENTSTATE_READONLY);
-}
-else
-{
-    result.string(OfferUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED);
-}
+result.string(OfferUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED);
diff --git a/entity/Offer_entity/entityfields/contact_id/valueProcess.js b/entity/Offer_entity/entityfields/contact_id/valueProcess.js
index c50907d05b5a89d6a44af670474fff35f2f6c74d..c0b04b66955d098cc77487c068ccbf00045c7b76 100644
--- a/entity/Offer_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/Offer_entity/entityfields/contact_id/valueProcess.js
@@ -6,27 +6,31 @@ import("Sql_lib");
 import("Context_lib");
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-var contactId = "";
-if ((!vars.exists("$param.ContactId_param") || !vars.get("$param.ContactId_param")) 
-    && (vars.exists("$param.ObjectType_param") 
-        && vars.get("$param.ObjectType_param") 
-        && vars.exists("$param.ObjectRowId_param") 
-        && vars.get("$param.ObjectRowId_param"))) 
 {
-    contactId = ContextUtils.getContactId(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"))
-} else if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param")) {
-    contactId = vars.get("$param.ContactId_param");
-}
-
-if (contactId) 
-{
-    var lang = newSelect("ISOLANGUAGE")
-                    .from("CONTACT")
-                    .where("CONTACT.CONTACTID", contactId)
-                    .cell();
-
-    if(lang != "") 
-        neon.setFieldValue("field.ISOLANGUAGE", lang);
+    var contactId = "";
+    if ((!vars.exists("$param.ContactId_param") || !vars.get("$param.ContactId_param")) 
+        && (vars.exists("$param.ObjectType_param") 
+            && vars.get("$param.ObjectType_param") 
+            && vars.exists("$param.ObjectRowId_param") 
+            && vars.get("$param.ObjectRowId_param"))) 
+    {
+        contactId = ContextUtils.getContactId(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"));
+    }
+    else if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
+    {
+        contactId = vars.get("$param.ContactId_param");
+    }
     
-    result.string(contactId);
-}
\ No newline at end of file
+    if (contactId) 
+    {
+        var lang = newSelect("ISOLANGUAGE")
+                        .from("CONTACT")
+                        .where("CONTACT.CONTACTID", contactId)
+                        .cell();
+                    
+        if(lang != "") 
+            neon.setFieldValue("field.ISOLANGUAGE", lang);
+        
+        result.string(contactId);
+    }
+}