diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js
index 98c03d277..432cbe19b 100644
--- a/admin/src/pages/Creation.spec.js
+++ b/admin/src/pages/Creation.spec.js
@@ -71,8 +71,10 @@ describe('Creation', () => {
               searchText: '',
               currentPage: 1,
               pageSize: 25,
-              filterByActivated: true,
-              filterByDeleted: false,
+              filters: {
+                filterByActivated: true,
+                filterByDeleted: false,
+              },
             },
           }),
         )
@@ -271,8 +273,10 @@ describe('Creation', () => {
                 searchText: 'XX',
                 currentPage: 1,
                 pageSize: 25,
-                filterByActivated: true,
-                filterByDeleted: false,
+                filters: {
+                  filterByActivated: true,
+                  filterByDeleted: false,
+                },
               },
             }),
           )
@@ -288,8 +292,10 @@ describe('Creation', () => {
                   searchText: '',
                   currentPage: 1,
                   pageSize: 25,
-                  filterByActivated: true,
-                  filterByDeleted: false,
+                  filters: {
+                    filterByActivated: true,
+                    filterByDeleted: false,
+                  },
                 },
               }),
             )
@@ -305,8 +311,10 @@ describe('Creation', () => {
               searchText: '',
               currentPage: 2,
               pageSize: 25,
-              filterByActivated: true,
-              filterByDeleted: false,
+              filters: {
+                filterByActivated: true,
+                filterByDeleted: false,
+              },
             },
           }),
         )
diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue
index 54bc0d735..17962bfff 100644
--- a/admin/src/pages/Creation.vue
+++ b/admin/src/pages/Creation.vue
@@ -102,8 +102,10 @@ export default {
             searchText: this.criteria,
             currentPage: this.currentPage,
             pageSize: this.perPage,
-            filterByActivated: true,
-            filterByDeleted: false,
+            filters: {
+              filterByActivated: true,
+              filterByDeleted: false,
+            },
           },
           fetchPolicy: 'network-only',
         })
diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index 1a23b4292..a1d809a66 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -7,7 +7,7 @@ const localVue = global.localVue
 const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
     searchUsers: {
-      userCount: 1,
+      userCount: 4,
       userList: [
         {
           userId: 1,
diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts
index 1df80aa1a..4771232ea 100644
--- a/backend/src/graphql/resolver/AdminResolver.test.ts
+++ b/backend/src/graphql/resolver/AdminResolver.test.ts
@@ -320,6 +320,21 @@ describe('AdminResolver', () => {
       })
 
       describe('with admin rights', () => {
+        const allUsers = {
+          bibi: expect.objectContaining({
+            email: 'bibi@bloxberg.de',
+          }),
+          garrick: expect.objectContaining({
+            email: 'garrick@ollivander.com',
+          }),
+          peter: expect.objectContaining({
+            email: 'peter@lustig.de',
+          }),
+          stephen: expect.objectContaining({
+            email: 'stephen@hawking.uk',
+          }),
+        }
+
         beforeAll(async () => {
           admin = await userFactory(testEnv, peterLustig)
           await query({
@@ -337,23 +352,8 @@ describe('AdminResolver', () => {
           resetToken()
         })
 
-        describe('find', () => {
-          const allUsers = {
-            bibi: expect.objectContaining({
-              email: 'bibi@bloxberg.de',
-            }),
-            garrick: expect.objectContaining({
-              email: 'garrick@ollivander.com',
-            }),
-            peter: expect.objectContaining({
-              email: 'peter@lustig.de',
-            }),
-            stephen: expect.objectContaining({
-              email: 'stephen@hawking.uk',
-            }),
-          }
-
-          it('all users by "filters === null"', async () => {
+        describe('without any filters', () => {
+          it('finds all users', async () => {
             await expect(
               query({
                 query: searchUsers,
@@ -372,8 +372,10 @@ describe('AdminResolver', () => {
               }),
             )
           })
+        })
 
-          it('all users by "filterByActivated === null && filterByDeleted === null"', async () => {
+        describe('all filters are null', () => {
+          it('finds all users', async () => {
             await expect(
               query({
                 query: searchUsers,
@@ -396,8 +398,10 @@ describe('AdminResolver', () => {
               }),
             )
           })
+        })
 
-          it('users with unchecked email', async () => {
+        describe('filter by unchecked email', () => {
+          it('finds only users with unchecked email', async () => {
             await expect(
               query({
                 query: searchUsers,
@@ -420,8 +424,10 @@ describe('AdminResolver', () => {
               }),
             )
           })
+        })
 
-          it('users with deleted account', async () => {
+        describe('filter by deleted users', () => {
+          it('finds only users with deleted account', async () => {
             await expect(
               query({
                 query: searchUsers,
@@ -444,8 +450,10 @@ describe('AdminResolver', () => {
               }),
             )
           })
+        })
 
-          it('no users with deleted account and unchecked email', async () => {
+        describe('filter by deleted account and unchecked email', () => {
+          it('finds no users', async () => {
             await expect(
               query({
                 query: searchUsers,