diff --git a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
index c9be3c889870754bed49436e6818a86aebc8ca22..32834d7795ed019a1dc794be35c67e45640c47ae 100644
--- a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
 import("system.db");
 import("system.vars");
 import("system.question");
@@ -20,13 +21,18 @@ var additionalPlaceholders = [
     new Placeholder("offerCode", Placeholder.types.FIXEDVALUE, vars.get("$field.FullOfferCode"))
 ];
 
-if (vars.get("$field.CONTACT_ID") == null || "") contactId = vars.get("$field.CONTACT_ORG_ID");
+if (Utils.isNullOrEmptyString(vars.get("$field.CONTACT_ID")))
+{
+    contactId = vars.get("$field.CONTACT_ORG_ID");
+}
 
 offerReport.content = arrayReport[1];
 offerReport.mimeType = MimeTypes.PDF();
-offerReport.filename = translate.text("Offer No.") + vars.get("$field.#CONTENTTITLE") + ".pdf";
+offerReport.filename = translate.text("Offer No.") + vars.get("$field.OfferCode_VersNr_fieldgroup") + ".pdf";
 
 attachmentArray[0] = offerReport;
 
-EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, updateStatements, 
-                                        $KeywordRegistry.documentTemplateTypeCategory$single());
+EmailWritingUtils.sendReportAsMail(
+    contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, updateStatements, 
+    $KeywordRegistry.documentTemplateTypeCategory$single()
+);