diff --git a/entity/Offer_entity/entityfields/address/valueProcess.js b/entity/Offer_entity/entityfields/address/valueProcess.js
index e7878513e8aaa088d2ba5623aac2c49be81f73ab..19a8e97b04c7e10f4e2674b5a747507077d02637 100644
--- a/entity/Offer_entity/entityfields/address/valueProcess.js
+++ b/entity/Offer_entity/entityfields/address/valueProcess.js
@@ -1,7 +1,16 @@
+import("PostalAddress_lib");
+import("system.neon");
 import("system.result");
 import("system.vars");
 
-if (vars.get("$param.OfferAddress_param") && vars.get("$this.value") == null) 
+if(vars.get("$this.value") == null)
 {
-    result.string(vars.get("$param.OfferAddress_param"));
-}
\ No newline at end of file
+    if (vars.get("$param.OfferAddress_param")) 
+    {
+        result.string(vars.get("$param.OfferAddress_param"));
+    }
+    else if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
+    {
+        result.string(vars.get("$field.ChosenAddress.displayValue"));
+    }
+}
diff --git a/entity/Offer_entity/entityfields/object_rowid/valueProcess.js b/entity/Offer_entity/entityfields/object_rowid/valueProcess.js
index 8682d1f41d4023e8e347ad32eb1c0760af54f0fb..9b9129b1c8572ea45f32d19c867d34f78aa5ad41 100644
--- a/entity/Offer_entity/entityfields/object_rowid/valueProcess.js
+++ b/entity/Offer_entity/entityfields/object_rowid/valueProcess.js
@@ -1,6 +1,18 @@
 import("system.neon");
 import("system.vars");
 import("system.result");
+import("Sql_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
-    result.string(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
+    result.string(vars.get("$param.ObjectRowId_param"));
+else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ContactId_param"))
+{
+    var dataColumn = newSelect("SALESPROJECTID")
+        .from("SALESPROJECT")
+        .where("SALESPROJECT.CONTACT_ID", vars.get("$param.ContactId_param"))
+        .arrayColumn();
+    if(dataColumn.length == 1)
+    {
+        result.string(dataColumn[0]);
+    }
+}