diff --git a/src/views/users/components/UsersFilter.vue b/src/views/users/components/UsersFilter.vue
index b952f07c54649a1b0921a61a36662182b1b48de6..379577d77a4ba56d4183a4dec47c6b308571ca1f 100644
--- a/src/views/users/components/UsersFilter.vue
+++ b/src/views/users/components/UsersFilter.vue
@@ -66,16 +66,27 @@ export default {
         ? currentFilters.push(this.$data.value[Math.max(indexOfActive, indexOfDeactivated, indexOfPending, indexOfUnconfirmed)])
         : currentFilters
 
-      Math.max(indexOfPerson, indexOfService, indexOfApplication) > -1
-        ? currentFilters.push(this.$data.value[Math.max(indexOfPerson, indexOfService, indexOfApplication)])
-        : currentFilters
+      const actorTypeFilters = [indexOfPerson, indexOfService, indexOfApplication].reduce((acc, index) => {
+        if (index > -1) {
+          currentFilters.push(this.$data.value[index])
+          acc.push(this.$data.value[index])
+        }
+        return acc
+      }, [])
 
-      return currentFilters
+      return [
+        currentFilters,
+        currentFilters.filter(filter => !actorTypeFilters.includes(filter)),
+        actorTypeFilters
+      ]
     },
     toggleFilters() {
-      this.$data.value = this.removeOppositeFilters()
-      const currentFilters = this.$data.value.reduce((acc, filter) => ({ ...acc, [filter]: true }), {})
+      const [allFilters, filters, actorTypeFilters] = this.removeOppositeFilters()
+
+      this.$data.value = allFilters
+      const currentFilters = filters.reduce((acc, filter) => ({ ...acc, [filter]: true }), {})
       this.$store.dispatch('ToggleUsersFilter', currentFilters)
+      this.$store.dispatch('ToggleActorTypeFilter', actorTypeFilters)
     }
   }
 }