diff --git a/Layout/default/Address/Index.php b/Layout/default/Address/Index.php
index d21a2660c..3a5d2483f 100644
--- a/Layout/default/Address/Index.php
+++ b/Layout/default/Address/Index.php
@@ -142,9 +142,19 @@
                   <input type="text" class="form-control" name="filter[note]" id="filter_note" value="<?=array_key_exists('note', $filter) ? $filter['note'] : ""?>" />
                 </div>
                 
+                <div class="col-1">
+                  <label class="form-label" for="filter_type">Kundentyp</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>
+                  </select>
+                </div>
                 
                 
               </div>
+              
+              
               <div class="row mt-2">
                 <div class="col">
                   <button type="submit" class="btn btn-primary">Filter anwenden</button>
diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index 2ea7d8c14..dcbd2a9a9 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -78,6 +78,21 @@ class AddressController extends mfBaseController {
         unset($filter['fibu_account_number']);
       }
       
+      
+      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;
+          } elseif($filter["type"] == "others") {
+            $new_filter["customer_number"] = false;
+          }
+        } else {
+          $new_filter["customer_number"] = true;
+        }
+        unset($filter["type"]);
+        unset($filter["customer_number"]);
+      }
+      
       foreach($filter as $name => $value) {
         $new_filter[$name] = $value;
       }
diff --git a/application/Address/AddressModel.php b/application/Address/AddressModel.php
index 977cc96cb..62a8ba3ce 100644
--- a/application/Address/AddressModel.php
+++ b/application/Address/AddressModel.php
@@ -232,6 +232,10 @@ class AddressModel {
       $cn = $filter["customer_number"];
       if(is_numeric($cn)) {
         $where .= " AND customer_number=$cn";
+      } elseif($cn === true) {
+        $where .= " AND customer_number > 0";
+      } elseif($cn === false || $cn === null) {
+        $where .= " AND customer_number IS NULL";
       }
     }