diff --git a/Layout/default/Address/Index.php b/Layout/default/Address/Index.php
index e1ca5736e..c60c3ef49 100644
--- a/Layout/default/Address/Index.php
+++ b/Layout/default/Address/Index.php
@@ -142,7 +142,7 @@
                   <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'"?>>Xinon</option>
+                    <option value="systemowner" <?=(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 716417a21..233a3d92c 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -73,7 +73,7 @@ class AddressController extends mfBaseController {
     private function getPreparedFilter($filter) {
         $new_filter = [];
 
-        if (is_array($filter) && count($filter)) {
+        if (is_array($filter)) {
 
             $new_filter['add-where'] = "";