diff --git a/src/store/modules/users.js b/src/store/modules/users.js
index 09854c596a884c65784d6ab2c4013e7e60ca10d9..4ea3b43d704ca309059b0f0ea73b104a95fb0816 100644
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -7,7 +7,12 @@ const users = {
     searchQuery: '',
     totalUsersCount: 0,
     currentPage: 1,
-    showLocalUsersOnly: false
+    filters: {
+      showLocalUsersOnly: false,
+      showExternalUsersOnly: false,
+      showActiveUsersOnly: false,
+      showDeactivatedUsersOnly: false
+    }
   },
   mutations: {
     SET_USERS: (state, users) => {
@@ -37,13 +42,13 @@ const users = {
     SET_SEARCH_QUERY: (state, query) => {
       state.searchQuery = query
     },
-    SET_LOCAL_USERS_FILTER: (state, value) => {
-      state.showLocalUsersOnly = value
+    SET_USERS_FILTER: (state, filters) => {
+      state.filters = filters
     }
   },
   actions: {
     async FetchUsers({ commit, state, getters }, { page }) {
-      const response = await fetchUsers(state.showLocalUsersOnly, getters.authHost, getters.token, page)
+      const response = await fetchUsers(state.filters.showLocalUsersOnly, getters.authHost, getters.token, page)
 
       commit('SET_LOADING', true)
 
@@ -62,14 +67,21 @@ const users = {
         commit('SET_LOADING', true)
         commit('SET_SEARCH_QUERY', query)
 
-        const response = await searchUsers(query, state.showLocalUsersOnly, getters.authHost, getters.token, page)
+        const response = await searchUsers(query, state.filters.showLocalUsersOnly, getters.authHost, getters.token, page)
 
         loadUsers(commit, page, response.data)
       }
     },
-    async ToggleLocalUsersFilter({ commit, dispatch, state }, value) {
-      commit('SET_LOCAL_USERS_FILTER', value)
-      dispatch('SearchUsers', { query: state.searchQuery, page: 1 })
+    async ToggleUsersFilter({ commit, dispatch, state }, filters) {
+      const newFilters = Object.keys(state.filters).reduce((acc, filter) => {
+        if (filters.includes(filter)) {
+          return { ...acc, [filter]: true }
+        } else {
+          return { ...acc, [filter]: false }
+        }
+      }, {})
+      commit('SET_USERS_FILTER', newFilters)
+      // dispatch('SearchUsers', { query: state.searchQuery, page: 1 })
     },
     async ToggleRight({ commit, getters }, { user, right }) {
       user.roles[right]