diff --git a/tine20/Sales/Export/Document.php b/tine20/Sales/Export/Document.php
index 99d10d5d3c1..60da42f725d 100644
--- a/tine20/Sales/Export/Document.php
+++ b/tine20/Sales/Export/Document.php
@@ -30,6 +30,7 @@ protected function _loadTwig()
                     ],
                 ],
                 Sales_Model_Document_Abstract::FLD_RECIPIENT_ID => [],
+                Sales_Model_Document_Abstract::FLD_DEBITOR_ID => [],
                 Sales_Model_Document_Abstract::FLD_POSITIONS => [],
                 Sales_Model_Document_Abstract::FLD_BOILERPLATES => [],
                 Sales_Model_Document_Abstract::FLD_DOCUMENT_CATEGORY => [],
diff --git a/tine20/Sales/Export/templates/sales_document_offer.docx b/tine20/Sales/Export/templates/sales_document_offer.docx
index fbebc550a35..3d44561f162 100644
Binary files a/tine20/Sales/Export/templates/sales_document_offer.docx and b/tine20/Sales/Export/templates/sales_document_offer.docx differ
diff --git a/tine20/Sales/js/CustomerEditDialog.js b/tine20/Sales/js/CustomerEditDialog.js
index 4674dffb416..8560f071f62 100644
--- a/tine20/Sales/js/CustomerEditDialog.js
+++ b/tine20/Sales/js/CustomerEditDialog.js
@@ -287,6 +287,7 @@ Tine.Sales.CustomerEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
                     }]
                 }, {
                     xtype: 'fieldset',
+                    hidden: this.denormalizationRecordClass,
                     layout: 'hfit',
                     autoHeight: true,
                     title: this.app.i18n._('Debitors'),
diff --git a/tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js b/tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js
index 7eb53ac317f..e4a48d1edd7 100644
--- a/tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js
+++ b/tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js
@@ -144,7 +144,10 @@ Tine.Tinebase.widgets.form.RecordPickerComboBox = Ext.extend(Ext.ux.form.Clearab
                 allowCreateNew: false,
                 preserveJsonProps: 'original_id',
                 qtip: window.i18n._('Edit copy'),
-                editDialogMode: 'local'
+                editDialogConfig: {
+                    mode: 'local',
+                    denormalizationRecordClass: this.denormalizationRecordClass
+                }
             }));
             this.useEditPlugin = false;
         }