diff --git a/inventory-app/inventory.py b/inventory-app/inventory.py
index 9ab7c40..99e1d91 100644
--- a/inventory-app/inventory.py
+++ b/inventory-app/inventory.py
@@ -408,8 +408,6 @@ def view_inventory(slug=None):
     user = request.args.get("user", type=ObjectId)
     owner = request.args.get("owner", type=ObjectId)
     grid = request.args.get("grid", type=str) == "true"
-    owner_disabled = request.args.get("owner_disabled", type=str) == "true"
-    user_disabled = request.args.get("user_disabled", type=str) == "true"
     sort_fields = {
       "last_seen": "Last seen",
       "inventory_audit_timestamp": "Last audited",
@@ -473,16 +471,10 @@ def view_inventory(slug=None):
         q["inventory.user.username"] = user
     if owner:
         q["inventory.owner.username"] = owner
-
-    q2 = {"type": {"$ne": "token"}}
-    if not public_view and owner_disabled:
-        q2["Owner.enabled"] = False
-    if not public_view and user_disabled:
-        q2["User.enabled"] = False
     q, selectors, sort_field, sort_field_final, sort_direction = build_query(dict(q), fields, sort_fields)
     items = db.inventory.aggregate([
         { "$match": q },
-        { "$match": q2 },
+        { "$match": {"type": {"$ne": "token"}} },
         { "$sort": { sort_field_final : 1 if sort_direction == "asc" else -1 } }
     ])
     return render_template(template, **locals())
diff --git a/inventory-app/templates/inventory_filter.html b/inventory-app/templates/inventory_filter.html
index b6ea79e..845a96b 100644
--- a/inventory-app/templates/inventory_filter.html
+++ b/inventory-app/templates/inventory_filter.html
@@ -58,22 +58,6 @@
         </label>
       </div>
       {% endif %}
-      {% if not public_view %}
-      <div class="input-field col s12 m2">
-        <label>
-          <input type="checkbox" value="true"
-            name="owner_disabled" {% if owner_disabled %} checked="checked" {% endif %}/>
-          <span>Owner disabled</span>
-        </label>
-      </div>
-      <div class="input-field col s12 m2">
-        <label>
-          <input type="checkbox" value="true"
-            name="user_disabled" {% if user_disabled %} checked="checked" {% endif %}/>
-          <span>User disabled</span>
-        </label>
-      </div>
-      {% endif %}
       <div class="input-field col s12 m2" name="item_type">
         <button type="submit">Apply</button>
         <button type="reset">Reset</button>