diff --git a/Layout/default/Address/Index.php b/Layout/default/Address/Index.php
index 3a5d2483f..170f0336b 100644
--- a/Layout/default/Address/Index.php
+++ b/Layout/default/Address/Index.php
@@ -143,11 +143,11 @@
                 </div>
                 
                 <div class="col-1">
-                  <label class="form-label" for="filter_type">Kundentyp</label>
+                  <label class="form-label" for="filter_type">Mandant</label>
                   <select class="form-control" name="filter[type]" id="filter_type">
                     <option value="<?=(array_key_exists('type', $filter) && $filter["type"] == "all") ? "selected='selected'" : ""?>">Alle</option>
-                    <option value="xinon" <?=(array_key_exists('type', $filter) && $filter["type"] != "xinon") ? "" : "selected='selected'"?>>Nur Xinon-Kunden</option>
-                    <option value="others" <?=(array_key_exists('type', $filter) && $filter["type"] == "others") ? "selected='selected'" : ""?>>Nicht-Xinon-Kunden</option>
+                    <option value="xinon" <?=(array_key_exists('type', $filter) && $filter["type"] != "xinon") ? "" : "selected='selected'"?>>Xinon</option>
+                    <option value="others" <?=(array_key_exists('type', $filter) && $filter["type"] == "others") ? "selected='selected'" : ""?>>Fremd</option>
                   </select>
                 </div>
                 
diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index dcbd2a9a9..84c0e167e 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -82,12 +82,12 @@ class AddressController extends mfBaseController {
       if(!array_key_exists("customer_number", $filter) || !$filter["customer_number"]) {
         if(array_key_exists("type", $filter)) {
           if($filter["type"] == "xinon") {
-            $new_filter["customer_number"] = true;
+            $new_filter["customer_or_fibu_numbers"] = true;
           } elseif($filter["type"] == "others") {
-            $new_filter["customer_number"] = false;
+            $new_filter["customer_or_fibu_numbers"] = false;
           }
         } else {
-          $new_filter["customer_number"] = true;
+          $new_filter["customer_or_fibu_numbers"] = true; // default
         }
         unset($filter["type"]);
         unset($filter["customer_number"]);
diff --git a/application/Address/AddressModel.php b/application/Address/AddressModel.php
index 62a8ba3ce..3d2759ebe 100644
--- a/application/Address/AddressModel.php
+++ b/application/Address/AddressModel.php
@@ -267,6 +267,15 @@ class AddressModel {
       }
     }
     
+    if(array_key_exists("customer_or_fibu_numbers", $filter)) {
+      $cn = $filter["customer_or_fibu_numbers"];
+      if($cn === true) {
+        $where .= " AND (customer_number > 0 OR fibu_account_number > 0 OR fibu_supplier_number > 0)";
+      } elseif($cn === false || $cn === null) {
+        $where .= " AND customer_number IS NULL AND fibu_account_number IS NULL AND fibu_supplier_number IS NULL";
+      }
+    }
+    
     if(array_key_exists("spin", $filter)) {
       $spin = FronkDB::singleton()->escape($filter["spin"]);
       if($spin) {