diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index 77beb4149..319b63571 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -561,12 +561,21 @@ class AddressController extends mfBaseController {
       }
     }
     
-    
-    $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "mergedName" => $search]));
-    $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "company" => $search]));
-    $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "firstname" => $search]));
-    $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "lastname" => $search]));
-    
+
+    if (isset($_GET['fibu_primary_account'])) {
+        $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "mergedName" => $search, "fibu_primary_account" => true]));
+        $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "company" => $search, "fibu_primary_account" => true]));
+        $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "firstname" => $search, "fibu_primary_account" => true]));
+        $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "lastname" => $search, "fibu_primary_account" => true]));
+        $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "street" => $search, "fibu_primary_account" => true]));
+
+    } else {
+        $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "mergedName" => $search]));
+        $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "company" => $search]));
+        $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "firstname" => $search]));
+        $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "lastname" => $search]));
+    }
+
     if(!is_array($addresses) || !count($addresses)) {
       return false;
     }
diff --git a/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js b/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js
index 98ad20792..87561cef7 100644
--- a/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js
+++ b/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js
@@ -445,7 +445,7 @@ Vue.component('warehouse-shipping-note-modal', {
     data() {
         return {
             window:                  window,
-            billAddrAutoCompleteUrl: window.TT_CONFIG['BASE_PATH'] + '/Address/Api?do=findAddress',
+            billAddrAutoCompleteUrl: window.TT_CONFIG['BASE_PATH'] + '/Address/Api?do=findAddress&fibu_primary_account=1',
             billAddrId:              '',
             delAddrName:             '',
             delAddrLine:             '',
@@ -462,7 +462,7 @@ Vue.component('warehouse-shipping-note-modal', {
 
     //language=Vue
     template: `
-                <tt-modal :show="true" @submit="submit" :delete="false" :title="title" @update:show="$emit('close')">
+                <tt-modal :show="true" @submit="submit" @delete="reqDelete" :delete="id !== 'create'" :title="title" @update:show="$emit('close')">
                   <div style="width: 99%">
                     <h4 class="text-center">Liefer- und Rechnungsadresse</h4>
                     <tt-autocomplete v-model="billAddrId" :api-url="billAddrAutoCompleteUrl" label="Rechnungsadresse" sm row/>
@@ -536,8 +536,14 @@ Vue.component('warehouse-shipping-note-modal', {
         }
     },
     methods:  {
-        openSigningModal() {
-
+        async reqDelete() {
+            const response = await axios.post(window.TT_CONFIG['DELETE_URL'], {id: this.id});
+            if (response.data.success) {
+                this.window.notify('success', response.data.message || 'Erfolgreich gelöscht');
+                this.$emit('close');
+            } else {
+                this.window.notify('error', response.data.message || 'Ein Fehler ist aufgetreten');
+            }
         },
         async submit() {
             const data = {