diff --git a/application/WarehouseOrder/WarehouseOrderController.php b/application/WarehouseOrder/WarehouseOrderController.php
index 24ac77429..b96edda53 100644
--- a/application/WarehouseOrder/WarehouseOrderController.php
+++ b/application/WarehouseOrder/WarehouseOrderController.php
@@ -219,6 +219,7 @@ class WarehouseOrderController extends TTCrud {
             $mail->Password   = TT_WAREHOUSE_ORDER_SMTP_PASS;
             $mail->SMTPSecure = PHPMailer\PHPMailer\PHPMailer::ENCRYPTION_STARTTLS;
             $mail->Port       = 587;
+            $mail->CharSet = "UTF-8";
 
             // Recipients
             $mail->setFrom('einkauf@xinon.at', 'XINON Einkauf');
diff --git a/public/js/pages/WarehouseOrder/WarehouseOrder.js b/public/js/pages/WarehouseOrder/WarehouseOrder.js
index c97b14cde..ed5e81b55 100644
--- a/public/js/pages/WarehouseOrder/WarehouseOrder.js
+++ b/public/js/pages/WarehouseOrder/WarehouseOrder.js
@@ -283,7 +283,7 @@ Vue.component('warehouse-order-modal', {
                     >
                       <template #form-actions-append>
                         <tt-button
-                          v-if="!isNaN(parseInt($refs.positionsManager.formData.article))"
+                          v-if="!isNaN(parseInt($refs.positionsManager?.formData?.article))"
                           text="Zum Artikel" 
                           sm 
                           additional-class="btn-outline-primary"
@@ -436,6 +436,7 @@ Vue.component('warehouse-order-modal', {
         },
         async fetchDistributors(article) {
             const url = `${window.TT_CONFIG["BASE_PATH"]}/WarehouseOrder/getArticleDistributorData`;
+            console.log(article);
             const params = typeof article === 'string' ? {allDistributor: true} : {articleId: article};
             if (JSON.stringify(params) === JSON.stringify(this.lastDistributorFetch)) return;
 
diff --git a/public/plugins/vue/tt-components/tt-autocomplete.js b/public/plugins/vue/tt-components/tt-autocomplete.js
index 29395a2f5..291b77531 100644
--- a/public/plugins/vue/tt-components/tt-autocomplete.js
+++ b/public/plugins/vue/tt-components/tt-autocomplete.js
@@ -100,7 +100,9 @@ Vue.component('tt-autocomplete', {
     },
     methods: {
         setOldDisplayValue(newValue, oldValue) {
-            if (this.emitDisplayValue && newValue) this.$emit('displayValue', newValue);
+            if (this.emitDisplayValue && newValue && typeof this.value !== 'number') {
+                this.$emit('displayValue', newValue);
+            }
             this.oldDisplayValue = oldValue;
         },
         async updateDisplayValue(newValue, oldValue) {