diff --git a/changelog/unreleased/enhancement-add-remove-users-from-groups-batch-actions b/changelog/unreleased/enhancement-add-remove-users-from-groups-batch-actions
new file mode 100644
index 00000000000..5259f1665b7
--- /dev/null
+++ b/changelog/unreleased/enhancement-add-remove-users-from-groups-batch-actions
@@ -0,0 +1,8 @@
+Enhancement: Add and remove users from groups batch actions
+
+We've introduced add and remove users from groups batch actions to the admin-settings app.
+
+https://github.com/owncloud/web/pull/8553
+https://github.com/owncloud/web/issues/8559
+https://github.com/owncloud/web/issues/8558
+https://github.com/owncloud/web/issues/8472
diff --git a/packages/web-app-admin-settings/src/components/AppTemplate.vue b/packages/web-app-admin-settings/src/components/AppTemplate.vue
index 9fb4e92539e..a9999688ee6 100644
--- a/packages/web-app-admin-settings/src/components/AppTemplate.vue
+++ b/packages/web-app-admin-settings/src/components/AppTemplate.vue
@@ -1,5 +1,5 @@
 <template>
-  <main class="oc-flex oc-height-1-1 app-content oc-width-1-1">
+  <main ref="appBarRef" class="oc-flex oc-height-1-1 app-content oc-width-1-1">
     <app-loading-spinner v-if="loading" />
     <template v-else>
       <div id="admin-settings-wrapper" class="oc-width-expand">
@@ -24,7 +24,16 @@
               </oc-button>
             </div>
           </div>
-          <slot name="topbarActions" class="oc-flex-1 oc-flex oc-flex-start" />
+          <div class="oc-flex oc-flex-middle oc-mt-xs">
+            <slot name="topbarActions" class="oc-flex-1 oc-flex oc-flex-start" />
+            <batch-actions
+              v-if="showBatchActions"
+              class="oc-ml-s"
+              :items="batchActionItems"
+              :actions="batchActions"
+              :limited-screen-space="limitedScreenSpace"
+            />
+          </div>
         </div>
         <slot name="mainContent" />
       </div>
@@ -49,14 +58,16 @@
 <script lang="ts">
 import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
 import SideBar from 'web-pkg/src/components/sideBar/SideBar.vue'
-import { defineComponent } from 'vue'
+import BatchActions from 'web-pkg/src/components/BatchActions.vue'
+import { defineComponent, onBeforeUnmount, onMounted, PropType, ref, unref } from 'vue'
 import { eventBus, useAppDefaults } from 'web-pkg'
 import { SideBarEventTopics } from 'web-pkg/src/composables/sideBar'
 
 export default defineComponent({
   components: {
     SideBar,
-    AppLoadingSpinner
+    AppLoadingSpinner,
+    BatchActions
   },
   props: {
     breadcrumbs: {
@@ -92,9 +103,33 @@ export default defineComponent({
       required: false,
       type: Boolean,
       default: false
+    },
+    showBatchActions: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    batchActionItems: {
+      type: Array as PropType<any>,
+      required: false,
+      default: () => []
+    },
+    batchActions: {
+      type: Array as PropType<any>,
+      required: false,
+      default: () => []
     }
   },
-  setup() {
+  setup(props) {
+    const appBarRef = ref()
+    const limitedScreenSpace = ref(false)
+    const onResize = () => {
+      limitedScreenSpace.value = props.sideBarOpen
+        ? window.innerWidth <= 1400
+        : window.innerWidth <= 1000
+    }
+    const resizeObserver = new ResizeObserver(onResize as ResizeObserverCallback)
+
     const closeSideBar = () => {
       eventBus.publish(SideBarEventTopics.close)
     }
@@ -104,7 +139,17 @@ export default defineComponent({
     const selectPanel = (panel) => {
       eventBus.publish(SideBarEventTopics.setActivePanel, panel)
     }
+
+    onMounted(() => {
+      resizeObserver.observe(unref(appBarRef))
+    })
+    onBeforeUnmount(() => {
+      resizeObserver.unobserve(unref(appBarRef))
+    })
+
     return {
+      appBarRef,
+      limitedScreenSpace,
       closeSideBar,
       toggleSideBar,
       selectPanel,
diff --git a/packages/web-app-admin-settings/src/components/Users/SideBar/GroupSelect.vue b/packages/web-app-admin-settings/src/components/Users/GroupSelect.vue
similarity index 100%
rename from packages/web-app-admin-settings/src/components/Users/SideBar/GroupSelect.vue
rename to packages/web-app-admin-settings/src/components/Users/GroupSelect.vue
diff --git a/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue b/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue
new file mode 100644
index 00000000000..8dcdd274f6a
--- /dev/null
+++ b/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <oc-modal
+    :title="title"
+    :message="message"
+    :button-cancel-text="$gettext('Cancel')"
+    :button-confirm-text="$gettext('Confirm')"
+    :button-confirm-disabled="!selectedOptions.length"
+    @cancel="$emit('cancel')"
+    @confirm="$emit('confirm', { users, groups: selectedOptions })"
+  >
+    <template #content>
+      <p class="oc-modal-body-message" v-text="message" />
+      <GroupSelect
+        :selected-groups="selectedOptions"
+        :group-options="groups"
+        @selected-option-change="changeSelectedGroupOption"
+      />
+    </template>
+  </oc-modal>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref } from 'vue'
+import { Group, User } from 'web-client/src/generated'
+import GroupSelect from './GroupSelect.vue'
+
+export default defineComponent({
+  name: 'GroupsModal',
+  components: { GroupSelect },
+  props: {
+    title: {
+      type: String,
+      required: true
+    },
+    message: {
+      type: String,
+      required: true
+    },
+    groups: {
+      type: Array as PropType<Group[]>,
+      required: true
+    },
+    users: {
+      type: Array as PropType<User[]>,
+      required: true
+    }
+  },
+  emits: ['confirm', 'cancel'],
+  setup() {
+    const selectedOptions = ref([])
+    const changeSelectedGroupOption = (options: Group[]) => {
+      selectedOptions.value = options
+    }
+    return {
+      selectedOptions,
+      changeSelectedGroupOption
+    }
+  }
+})
+</script>
diff --git a/packages/web-app-admin-settings/src/components/Users/SideBar/EditPanel.vue b/packages/web-app-admin-settings/src/components/Users/SideBar/EditPanel.vue
index a978eef88f7..ab2241b7122 100644
--- a/packages/web-app-admin-settings/src/components/Users/SideBar/EditPanel.vue
+++ b/packages/web-app-admin-settings/src/components/Users/SideBar/EditPanel.vue
@@ -106,7 +106,7 @@ import { computed, defineComponent, PropType, ref, unref } from 'vue'
 import * as EmailValidator from 'email-validator'
 import UserInfoBox from './UserInfoBox.vue'
 import CompareSaveDialog from 'web-pkg/src/components/sideBar/CompareSaveDialog.vue'
-import GroupSelect from './GroupSelect.vue'
+import GroupSelect from '../GroupSelect.vue'
 import QuotaSelect from 'web-pkg/src/components/QuotaSelect.vue'
 import { cloneDeep } from 'lodash-es'
 import { Group, User } from 'web-client/src/generated'
@@ -156,9 +156,7 @@ export default defineComponent({
     })
     const groupOptions = computed(() => {
       const { memberOf: selectedGroups } = unref(editUser)
-      return props.groups
-        .filter((g) => !selectedGroups.some((s) => s.id === g.id))
-        .sort((a, b) => a.displayName.localeCompare(b.displayName))
+      return props.groups.filter((g) => !selectedGroups.some((s) => s.id === g.id))
     })
 
     const isLoginInputDisabled = computed(() => currentUser.uuid === (props.user as User).id)
@@ -239,7 +237,7 @@ export default defineComponent({
     changeSelectedQuotaOption(option) {
       this.editUser.drive.quota.total = option.value
     },
-    changeSelectedGroupOption(option: Group) {
+    changeSelectedGroupOption(option: Group[]) {
       this.editUser.memberOf = option
     },
     async validateUserName() {
diff --git a/packages/web-app-admin-settings/src/mixins/users/addToGroups.ts b/packages/web-app-admin-settings/src/mixins/users/addToGroups.ts
new file mode 100644
index 00000000000..09501eb908e
--- /dev/null
+++ b/packages/web-app-admin-settings/src/mixins/users/addToGroups.ts
@@ -0,0 +1,25 @@
+import { eventBus } from 'web-pkg/src/services/eventBus'
+import { computed, Ref } from 'vue'
+import { useGettext } from 'vue3-gettext'
+
+export const useAddToGroups = (): { actions: Ref<unknown[]> } => {
+  const { $gettext } = useGettext()
+
+  const actions = computed((): unknown[] => [
+    {
+      name: 'add-to-groups',
+      icon: 'add',
+      componentType: 'button',
+      class: 'oc-users-actions-add-to-groups-trigger',
+      label: () => $gettext('Add to groups'),
+      isEnabled: ({ resources }) => resources.length > 0,
+      handler() {
+        eventBus.publish('app.admin-settings.users.actions.add-to-groups')
+      }
+    }
+  ])
+
+  return {
+    actions
+  }
+}
diff --git a/packages/web-app-admin-settings/src/mixins/users/removeFromGroups.ts b/packages/web-app-admin-settings/src/mixins/users/removeFromGroups.ts
new file mode 100644
index 00000000000..3a42ff16cbb
--- /dev/null
+++ b/packages/web-app-admin-settings/src/mixins/users/removeFromGroups.ts
@@ -0,0 +1,25 @@
+import { eventBus } from 'web-pkg/src/services/eventBus'
+import { computed, Ref } from 'vue'
+import { useGettext } from 'vue3-gettext'
+
+export const useRemoveFromGroups = (): { actions: Ref<unknown[]> } => {
+  const { $gettext } = useGettext()
+
+  const actions = computed((): unknown[] => [
+    {
+      name: 'remove-users-from-groups',
+      icon: 'subtract',
+      componentType: 'button',
+      class: 'oc-users-actions-remove-from-groups-trigger',
+      label: () => $gettext('Remove from groups'),
+      isEnabled: ({ resources }) => resources.length > 0,
+      handler() {
+        eventBus.publish('app.admin-settings.users.actions.remove-from-groups')
+      }
+    }
+  ])
+
+  return {
+    actions
+  }
+}
diff --git a/packages/web-app-admin-settings/src/views/Groups.vue b/packages/web-app-admin-settings/src/views/Groups.vue
index ffb5b05b1c3..e0956930a77 100644
--- a/packages/web-app-admin-settings/src/views/Groups.vue
+++ b/packages/web-app-admin-settings/src/views/Groups.vue
@@ -7,22 +7,24 @@
       :side-bar-active-panel="sideBarActivePanel"
       :side-bar-available-panels="sideBarAvailablePanels"
       :side-bar-open="sideBarOpen"
+      :show-batch-actions="!!selectedGroups.length"
+      :batch-actions="batchActions"
+      :batch-action-items="selectedGroups"
     >
       <template #topbarActions>
-        <div class="admin-settings-app-bar-actions oc-mt-xs">
+        <div class="admin-settings-app-bar-actions">
           <div v-if="selectedGroups.length" class="oc-flex oc-flex-middle">
             <span v-text="selectedGroupsText" />
             <oc-button
-              id="files-clear-selection"
+              id="groups-clear-selection"
               v-oc-tooltip="$gettext('Clear selection')"
               :aria-label="$gettext('Clear selection')"
-              class="oc-ml-m"
+              class="oc-ml-m oc-py-s"
               appearance="outline"
               @click="unselectAllGroups"
             >
               <oc-icon name="close" />
             </oc-button>
-            <batch-actions class="oc-ml-s" :items="selectedGroups" :actions="batchActions" />
           </div>
           <div v-else>
             <oc-button variation="primary" appearance="filled" @click="toggleCreateGroupModal">
@@ -72,7 +74,6 @@
 import GroupsList from '../components/Groups/GroupsList.vue'
 import CreateGroupModal from '../components/Groups/CreateGroupModal.vue'
 import ContextActions from '../components/Groups/ContextActions.vue'
-import BatchActions from 'web-pkg/src/components/BatchActions.vue'
 import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
 import {
   computed,
@@ -99,7 +100,6 @@ export default defineComponent({
     GroupsList,
     NoContentMessage,
     CreateGroupModal,
-    BatchActions,
     ContextActions
   },
   mixins: [Delete],
diff --git a/packages/web-app-admin-settings/src/views/Spaces.vue b/packages/web-app-admin-settings/src/views/Spaces.vue
index e70aa3f19ba..a310a496301 100644
--- a/packages/web-app-admin-settings/src/views/Spaces.vue
+++ b/packages/web-app-admin-settings/src/views/Spaces.vue
@@ -8,6 +8,9 @@
       :side-bar-available-panels="sideBarAvailablePanels"
       :side-bar-open="sideBarOpen"
       :is-side-bar-header-compact="selectedSpaces.length === 1"
+      :show-batch-actions="!!selectedSpaces.length"
+      :batch-actions="batchActions"
+      :batch-action-items="selectedSpaces"
     >
       <template #sideBarHeader>
         <space-info
@@ -17,23 +20,18 @@
         />
       </template>
       <template #topbarActions>
-        <div ref="appBarActionsRef" class="admin-settings-app-bar-actions oc-mt-xs">
+        <div class="admin-settings-app-bar-actions">
           <div v-if="selectedSpaces.length >= 1" class="oc-flex oc-flex-middle">
             <oc-button
-              id="files-clear-selection"
+              id="spaces-clear-selection"
               v-oc-tooltip="$gettext('Clear selection')"
               :aria-label="$gettext('Clear selection')"
+              class="oc-py-s"
               appearance="outline"
               @click="unselectAllSpaces"
             >
               <oc-icon name="close" />
             </oc-button>
-            <batch-actions
-              class="oc-ml-s"
-              :items="selectedSpaces"
-              :actions="batchActions"
-              :limited-screen-space="limitedScreenSpace"
-            />
           </div>
         </div>
       </template>
@@ -104,7 +102,6 @@ import SpaceNoSelection from 'web-pkg/src/components/sideBar/Spaces/SpaceNoSelec
 import ContextActions from '../components/Spaces/ContextActions.vue'
 import MembersPanel from '../components/Spaces/SideBar/MembersPanel.vue'
 import SpaceInfo from 'web-pkg/src/components/sideBar/Spaces/SpaceInfo.vue'
-import BatchActions from 'web-pkg/src/components/BatchActions.vue'
 import ActionsPanel from '../components/Spaces/SideBar/ActionsPanel.vue'
 import Delete from 'web-pkg/src/mixins/spaces/delete'
 import Disable from 'web-pkg/src/mixins/spaces/disable'
@@ -122,7 +119,6 @@ export default defineComponent({
     NoContentMessage,
     ContextActions,
     SpaceInfo,
-    BatchActions,
     QuotaModal
   },
   mixins: [Delete, Disable, Restore, EditQuota],
@@ -251,15 +247,6 @@ export default defineComponent({
       ].filter((p) => p.enabled)
     })
 
-    const limitedScreenSpace = ref(false)
-    const appBarActionsRef = ref()
-    const onResize = () => {
-      limitedScreenSpace.value = unref(sideBarOpen)
-        ? window.innerWidth <= 1280
-        : window.innerWidth <= 1000
-    }
-    const resizeObserver = new ResizeObserver(onResize)
-
     onMounted(async () => {
       await loadResourcesTask.perform()
       loadResourcesEventToken.value = eventBus.subscribe('app.admin-settings.list.load', () => {
@@ -269,7 +256,6 @@ export default defineComponent({
 
       calculateListHeaderPosition()
       window.addEventListener('resize', calculateListHeaderPosition)
-      resizeObserver.observe(unref(appBarActionsRef))
 
       updateQuotaForSpaceEventToken = eventBus.subscribe(
         'app.admin-settings.spaces.space.quota.updated',
@@ -288,7 +274,6 @@ export default defineComponent({
         'app.admin-settings.spaces.space.quota.updated',
         updateQuotaForSpaceEventToken
       )
-      resizeObserver.unobserve(unref(appBarActionsRef))
     })
 
     const quotaModalIsOpen = computed(() => instance.$data.$_editQuota_modalOpen)
@@ -316,9 +301,6 @@ export default defineComponent({
       toggleSelectAllSpaces,
       toggleSelectSpace,
       unselectAllSpaces,
-      limitedScreenSpace,
-      appBarActionsRef,
-      onResize,
       quotaModalIsOpen,
       closeQuotaModal,
       spaceQuotaUpdated
diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
index 1228dc81942..f3e53763e9c 100644
--- a/packages/web-app-admin-settings/src/views/Users.vue
+++ b/packages/web-app-admin-settings/src/views/Users.vue
@@ -7,22 +7,24 @@
       :side-bar-available-panels="sideBarAvailablePanels"
       :side-bar-open="sideBarOpen"
       :side-bar-loading="sideBarLoading"
+      :show-batch-actions="!!selectedUsers.length"
+      :batch-actions="batchActions"
+      :batch-action-items="selectedUsers"
     >
       <template #topbarActions>
-        <div class="admin-settings-app-bar-actions oc-mt-xs">
+        <div class="admin-settings-app-bar-actions">
           <div v-if="selectedUsers.length" class="oc-flex oc-flex-middle">
             <span v-text="selectedUsersText" />
             <oc-button
-              id="files-clear-selection"
+              id="users-clear-selection"
               v-oc-tooltip="$gettext('Clear selection')"
               :aria-label="$gettext('Clear selection')"
-              class="oc-ml-m"
+              class="oc-ml-m oc-py-s"
               appearance="outline"
               @click="unselectAllUsers"
             >
               <oc-icon name="close" />
             </oc-button>
-            <batch-actions class="oc-ml-s" :items="selectedUsers" :actions="batchActions" />
           </div>
           <div v-else>
             <oc-button variation="primary" appearance="filled" @click="toggleCreateUserModal">
@@ -99,6 +101,44 @@
         </div>
       </template>
     </app-template>
+    <groups-modal
+      v-if="addToGroupsModalIsOpen"
+      :title="$gettext('Add to groups')"
+      :message="
+        $ngettext(
+          'Add selected user %{user} to groups',
+          'Add %{userCount} selected users to groups ',
+          selectedUsers.length,
+          {
+            user: selectedUsers[0].displayName,
+            userCount: selectedUsers.length
+          }
+        )
+      "
+      :groups="groups"
+      :users="selectedUsers"
+      @cancel="() => (addToGroupsModalIsOpen = false)"
+      @confirm="addUsersToGroups"
+    />
+    <groups-modal
+      v-if="removeFromGroupsModalIsOpen"
+      :title="$gettext('Remove from groups')"
+      :message="
+        $ngettext(
+          'Remove selected user %{user} from groups',
+          'Remove %{userCount} selected users from groups ',
+          selectedUsers.length,
+          {
+            user: selectedUsers[0].displayName,
+            userCount: selectedUsers.length
+          }
+        )
+      "
+      :groups="groups"
+      :users="selectedUsers"
+      @cancel="() => (removeFromGroupsModalIsOpen = false)"
+      @confirm="removeUsersFromGroups"
+    />
     <create-user-modal
       v-if="createUserModalOpen"
       @cancel="toggleCreateUserModal"
@@ -123,7 +163,6 @@ import CreateUserModal from '../components/Users/CreateUserModal.vue'
 import ContextActions from '../components/Users/ContextActions.vue'
 import DetailsPanel from '../components/Users/SideBar/DetailsPanel.vue'
 import EditPanel from '../components/Users/SideBar/EditPanel.vue'
-import BatchActions from 'web-pkg/src/components/BatchActions.vue'
 import QuotaModal from 'web-pkg/src/components/Spaces/QuotaModal.vue'
 import Delete from '../mixins/users/delete'
 import {
@@ -146,7 +185,7 @@ import {
 } from 'vue'
 import { useTask } from 'vue-concurrency'
 import { eventBus } from 'web-pkg/src/services/eventBus'
-import { mapActions, mapGetters, mapMutations, mapState } from 'vuex'
+import { mapActions, mapMutations, mapState } from 'vuex'
 import AppTemplate from '../components/AppTemplate.vue'
 import { useSideBar } from 'web-pkg/src/composables/sideBar'
 import ItemFilter from 'web-pkg/src/components/ItemFilter.vue'
@@ -157,6 +196,10 @@ import { SpaceResource } from 'web-client/src'
 import { useGettext } from 'vue3-gettext'
 import { diff } from 'deep-object-diff'
 import { format } from 'util'
+import GroupsModal from '../components/Users/GroupsModal.vue'
+import { useRemoveFromGroups } from '../mixins/users/removeFromGroups'
+import { useAddToGroups } from '../mixins/users/addToGroups'
+import { configurationManager } from 'web-pkg'
 
 export default defineComponent({
   name: 'UsersView',
@@ -165,10 +208,10 @@ export default defineComponent({
     AppTemplate,
     UsersList,
     CreateUserModal,
-    BatchActions,
     ContextActions,
     ItemFilter,
-    QuotaModal
+    QuotaModal,
+    GroupsModal
   },
   mixins: [Delete, EditQuota],
   setup() {
@@ -178,6 +221,9 @@ export default defineComponent({
     const accessToken = useAccessToken({ store })
     const { graphClient } = useGraphClient()
 
+    const { actions: removeFromGroupsActions } = useRemoveFromGroups()
+    const { actions: addToGroupsActions } = useAddToGroups()
+
     const users = ref([])
     const groups = ref([])
     const roles = ref([])
@@ -186,13 +232,15 @@ export default defineComponent({
     const selectedUserIds = computed(() =>
       unref(selectedUsers).map((selectedUser) => selectedUser.id)
     )
-    const loadedUser = ref(null)
     const sideBarLoading = ref(false)
     const createUserModalOpen = ref(false)
+    const addToGroupsModalIsOpen = ref(false)
+    const removeFromGroupsModalIsOpen = ref(false)
     const listHeaderPosition = ref(0)
     const template = ref()
     let loadResourcesEventToken
-    let userUpdatedEventToken
+    let addToGroupsActionEventToken
+    let removeFromGroupsActionEventToken
 
     const filters = {
       groups: {
@@ -208,7 +256,7 @@ export default defineComponent({
     }
 
     const loadGroupsTask = useTask(function* (signal) {
-      const groupsResponse = yield unref(graphClient).groups.listGroups()
+      const groupsResponse = yield unref(graphClient).groups.listGroups('displayName')
       groups.value = groupsResponse.data.value
     })
 
@@ -298,7 +346,6 @@ export default defineComponent({
         selectedPersonalDrives.value.push(spaceResource)
       })
 
-      loadedUser.value = unref(selectedUsers).length === 1 ? unref(selectedUsers)[0] : null
       sideBarLoading.value = false
     })
 
@@ -307,9 +354,12 @@ export default defineComponent({
     }
 
     const batchActions = computed(() => {
-      return [...instance.$_delete_items, ...instance.$_editQuota_items].filter((item) =>
-        item.isEnabled({ resources: unref(selectedUsers) })
-      )
+      return [
+        ...instance.$_delete_items,
+        ...instance.$_editQuota_items,
+        ...unref(addToGroupsActions),
+        ...unref(removeFromGroupsActions)
+      ].filter((item) => item.isEnabled({ resources: unref(selectedUsers) }))
     })
 
     onMounted(async () => {
@@ -322,20 +372,34 @@ export default defineComponent({
         loadResourcesTask.perform()
         selectedUsers.value = []
       })
-      userUpdatedEventToken = eventBus.subscribe(
-        'app.admin-settings.users.user.updated',
-        (updatedUser) => {
-          selectedUsers.value = [updatedUser]
-          loadedUser.value = updatedUser
+
+      calculateListHeaderPosition()
+
+      addToGroupsActionEventToken = eventBus.subscribe(
+        'app.admin-settings.users.actions.add-to-groups',
+        () => {
+          addToGroupsModalIsOpen.value = true
+        }
+      )
+      removeFromGroupsActionEventToken = eventBus.subscribe(
+        'app.admin-settings.users.actions.remove-from-groups',
+        () => {
+          removeFromGroupsModalIsOpen.value = true
         }
       )
-      calculateListHeaderPosition()
       window.addEventListener('resize', calculateListHeaderPosition)
     })
 
     onBeforeUnmount(() => {
       eventBus.unsubscribe('app.admin-settings.list.load', loadResourcesEventToken)
-      eventBus.unsubscribe('app.admin-settings.users.user.updated', userUpdatedEventToken)
+      eventBus.unsubscribe(
+        'app.admin-settings.users.actions.add-to-groups',
+        addToGroupsActionEventToken
+      )
+      eventBus.unsubscribe(
+        'app.admin-settings.users.actions.remove-from-groups',
+        removeFromGroupsActionEventToken
+      )
     })
 
     const quotaModalIsOpen = computed(() => instance.$data.$_editQuota_modalOpen)
@@ -346,12 +410,103 @@ export default defineComponent({
       instance.$data.$_editQuota_selectedSpace.spaceQuota = quota
     }
 
+    const addUsersToGroups = async ({ users: affectedUsers, groups: groupsToAdd }) => {
+      try {
+        const usersToFetch = []
+        const addUsersToGroupsRequests = []
+        groupsToAdd.reduce((acc, group) => {
+          for (const user of affectedUsers) {
+            if (!user.memberOf.find((userGroup) => userGroup.id === group.id)) {
+              acc.push(
+                unref(graphClient).groups.addMember(
+                  group.id,
+                  user.id,
+                  configurationManager.serverUrl
+                )
+              )
+              if (!usersToFetch.includes(user.id)) {
+                usersToFetch.push(user.id)
+              }
+            }
+          }
+          return acc
+        }, addUsersToGroupsRequests)
+        await Promise.all(addUsersToGroupsRequests)
+        const usersResponse = await Promise.all(
+          usersToFetch.map((userId) => unref(graphClient).users.getUser(userId))
+        )
+        for (const { data: updatedUser } of usersResponse) {
+          const userIndex = unref(users).findIndex((user) => user.id === updatedUser.id)
+          unref(users)[userIndex] = updatedUser
+          const selectedUserIndex = unref(selectedUsers).findIndex(
+            (user) => user.id === updatedUser.id
+          )
+          if (selectedUserIndex >= 0) {
+            // FIXME: why do we need to update selectedUsers?
+            unref(selectedUsers)[selectedUserIndex] = updatedUser
+          }
+        }
+        await store.dispatch('showMessage', {
+          title: $gettext('Users were added to groups successfully')
+        })
+        addToGroupsModalIsOpen.value = false
+      } catch (e) {
+        console.error(e)
+        await store.dispatch('showMessage', {
+          title: $gettext('Failed add users to group'),
+          status: 'danger'
+        })
+      }
+    }
+
+    const removeUsersFromGroups = async ({ users: affectedUsers, groups: groupsToRemove }) => {
+      try {
+        const usersToFetch = []
+        const removeUsersToGroupsRequests = []
+        groupsToRemove.reduce((acc, group) => {
+          for (const user of affectedUsers) {
+            if (user.memberOf.find((userGroup) => userGroup.id === group.id)) {
+              acc.push(unref(graphClient).groups.deleteMember(group.id, user.id))
+              if (!usersToFetch.includes(user.id)) {
+                usersToFetch.push(user.id)
+              }
+            }
+          }
+          return acc
+        }, removeUsersToGroupsRequests)
+        await Promise.all(removeUsersToGroupsRequests)
+        const usersResponse = await Promise.all(
+          usersToFetch.map((userId) => unref(graphClient).users.getUser(userId))
+        )
+        for (const { data: updatedUser } of usersResponse) {
+          const userIndex = unref(users).findIndex((user) => user.id === updatedUser.id)
+          unref(users)[userIndex] = updatedUser
+          const selectedUserIndex = unref(selectedUsers).findIndex(
+            (user) => user.id === updatedUser.id
+          )
+          if (selectedUserIndex >= 0) {
+            // FIXME: why do we need to update selectedUsers?
+            unref(selectedUsers)[selectedUserIndex] = updatedUser
+          }
+        }
+        await store.dispatch('showMessage', {
+          title: $gettext('Users were removed from groups successfully')
+        })
+        removeFromGroupsModalIsOpen.value = false
+      } catch (e) {
+        console.error(e)
+        await store.dispatch('showMessage', {
+          title: $gettext('Failed remove users from group'),
+          status: 'danger'
+        })
+      }
+    }
+
     return {
       ...useSideBar(),
       maxQuota: useCapabilitySpacesMaxQuota(),
       template,
       selectedUsers,
-      loadedUser,
       sideBarLoading,
       users,
       roles,
@@ -362,17 +517,20 @@ export default defineComponent({
       accessToken,
       listHeaderPosition,
       createUserModalOpen,
+      addToGroupsModalIsOpen,
+      removeFromGroupsModalIsOpen,
       batchActions,
       filterGroups,
       filterRoles,
       quotaModalIsOpen,
       closeQuotaModal,
       spaceQuotaUpdated,
-      selectedPersonalDrives
+      selectedPersonalDrives,
+      addUsersToGroups,
+      removeUsersFromGroups
     }
   },
   computed: {
-    ...mapGetters(['configuration']),
     ...mapState({ currentUser: 'user' }),
 
     selectedUsersText() {
@@ -401,7 +559,11 @@ export default defineComponent({
           component: DetailsPanel,
           default: true,
           enabled: true,
-          componentAttrs: { user: this.loadedUser, users: this.selectedUsers, roles: this.roles }
+          componentAttrs: {
+            user: this.selectedUsers.length === 1 ? this.selectedUsers[0] : null,
+            users: this.selectedUsers,
+            roles: this.roles
+          }
         },
         {
           app: 'EditPanel',
@@ -411,7 +573,7 @@ export default defineComponent({
           default: false,
           enabled: this.selectedUsers.length === 1,
           componentAttrs: {
-            user: this.loadedUser,
+            user: this.selectedUsers.length === 1 ? this.selectedUsers[0] : null,
             roles: this.roles,
             groups: this.groups,
             onConfirm: this.editUser
@@ -428,13 +590,13 @@ export default defineComponent({
       if (this.allUsersSelected) {
         return (this.selectedUsers = [])
       }
-      this.selectedUsers = [...this.users]
+      this.selectedUsers = this.users
     },
     toggleSelectUser(toggledUser) {
       const isUserSelected = this.selectedUsers.find((user) => user.id === toggledUser.id)
 
       if (!isUserSelected) {
-        return this.selectedUsers.push(toggledUser)
+        return this.selectedUsers.push(this.users.find((u) => u.id === toggledUser.id))
       }
 
       this.selectedUsers = this.selectedUsers.filter((user) => user.id !== toggledUser.id)
@@ -493,11 +655,14 @@ export default defineComponent({
 
         const { data: updatedUser } = await this.graphClient.users.getUser(user.id)
         const userIndex = this.users.findIndex((user) => user.id === updatedUser.id)
-
         this.users[userIndex] = updatedUser
+        const selectedUserIndex = this.selectedUsers.findIndex((user) => user.id === updatedUser.id)
+        if (selectedUserIndex >= 0) {
+          // FIXME: why do we need to update selectedUsers?
+          this.selectedUsers[selectedUserIndex] = updatedUser
+        }
 
         eventBus.publish('sidebar.entity.saved')
-        eventBus.publish('app.admin-settings.users.user.updated', updatedUser)
 
         return updatedUser
       } catch (error) {
@@ -543,7 +708,7 @@ export default defineComponent({
 
       for (const groupToAdd of groupsToAdd) {
         requests.push(
-          this.graphClient.groups.addMember(groupToAdd.id, user.id, this.configuration.server)
+          this.graphClient.groups.addMember(groupToAdd.id, user.id, configurationManager.serverUrl)
         )
       }
       for (const groupToDelete of groupsToDelete) {
diff --git a/packages/web-app-admin-settings/tests/unit/components/Users/SideBar/GroupSelect.spec.ts b/packages/web-app-admin-settings/tests/unit/components/Users/GroupSelect.spec.ts
similarity index 91%
rename from packages/web-app-admin-settings/tests/unit/components/Users/SideBar/GroupSelect.spec.ts
rename to packages/web-app-admin-settings/tests/unit/components/Users/GroupSelect.spec.ts
index 3dfe51423d2..ac59af4be13 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Users/SideBar/GroupSelect.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/Users/GroupSelect.spec.ts
@@ -1,4 +1,4 @@
-import GroupSelect from '../../../../../src/components/Users/SideBar/GroupSelect.vue'
+import GroupSelect from '../../../../src/components/Users/GroupSelect.vue'
 import { defaultPlugins, shallowMount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { Group } from 'web-client/src/generated'
diff --git a/packages/web-app-admin-settings/tests/unit/components/Users/SideBar/__snapshots__/GroupSelect.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/components/Users/__snapshots__/GroupSelect.spec.ts.snap
similarity index 100%
rename from packages/web-app-admin-settings/tests/unit/components/Users/SideBar/__snapshots__/GroupSelect.spec.ts.snap
rename to packages/web-app-admin-settings/tests/unit/components/Users/__snapshots__/GroupSelect.spec.ts.snap
diff --git a/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts
index 82e643da46a..e21234ec357 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts
@@ -125,7 +125,7 @@ function getWrapper({ spaces = [{ name: 'Some Space' }] } = {}) {
   const mocks = {
     ...defaultComponentMocks(),
     $clientService,
-    ...getActionMixinMocks({ actions: mixins })
+    ...getActionMixinMocks({ actions: mixins, enabledActions: mixins })
   }
 
   const storeOptions = { ...defaultStoreMockOptions }
diff --git a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
index ae9f1331446..9dccd3f9e34 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
@@ -246,7 +246,7 @@ describe('Users view', () => {
       expect(updatedUser.drive.quota.total).toEqual(1000000000)
       expect(updatedUser.memberOf[0].id).toEqual('1')
 
-      expect(busStub).toHaveBeenCalledTimes(2)
+      expect(busStub).toHaveBeenCalled()
       expect(updateUserDriveStub).toHaveBeenCalled()
       expect(updateSpaceFieldStub).toHaveBeenCalled()
       expect(updateUserGroupAssignmentsStub).toHaveBeenCalled()
diff --git a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/General.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/General.spec.ts.snap
index 18a1197038c..94ea5f426d8 100644
--- a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/General.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/General.spec.ts.snap
@@ -2,6 +2,6 @@
 
 exports[`General view renders component 1`] = `
 <div>
-  <app-template-stub breadcrumbs="[object Object],[object Object]" issidebarheadercompact="false" loading="false" sidebaravailablepanels="" sidebarloading="false" sidebaropen="false"></app-template-stub>
+  <app-template-stub batchactionitems="" batchactions="" breadcrumbs="[object Object],[object Object]" issidebarheadercompact="false" loading="false" showbatchactions="false" sidebaravailablepanels="" sidebarloading="false" sidebaropen="false"></app-template-stub>
 </div>
 `;
diff --git a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap
index 813fcec5969..be4055afe59 100644
--- a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap
@@ -16,7 +16,10 @@ exports[`Spaces view loading states should render spaces list after loading has
             </button>
           </div>
         </div>
-        <div class="admin-settings-app-bar-actions oc-mt-xs">
+        <div class="oc-flex oc-flex-middle oc-mt-xs">
+          <div class="admin-settings-app-bar-actions">
+            <!--v-if-->
+          </div>
           <!--v-if-->
         </div>
       </div>
diff --git a/packages/web-pkg/src/components/ItemFilter.vue b/packages/web-pkg/src/components/ItemFilter.vue
index 97da084ed83..7d7bd55b9b3 100644
--- a/packages/web-pkg/src/components/ItemFilter.vue
+++ b/packages/web-pkg/src/components/ItemFilter.vue
@@ -23,6 +23,7 @@
                 class="item-filter-list-item oc-flex oc-flex-left oc-flex-middle oc-width-1-1 oc-p-xs"
                 justify-content="left"
                 appearance="raw"
+                :data-test-value="item[displayNameAttribute]"
                 @click="toggleItemSelection(item)"
               >
                 <div>
diff --git a/packages/web-pkg/tests/unit/components/__snapshots__/ItemFilter.spec.ts.snap b/packages/web-pkg/tests/unit/components/__snapshots__/ItemFilter.spec.ts.snap
index b0a8a655e39..875b3171110 100644
--- a/packages/web-pkg/tests/unit/components/__snapshots__/ItemFilter.spec.ts.snap
+++ b/packages/web-pkg/tests/unit/components/__snapshots__/ItemFilter.spec.ts.snap
@@ -18,7 +18,7 @@ exports[`ItemFilter can use a custom attribute as display name 1`] = `
         <div>
           <ul class="oc-list oc-my-rm oc-mx-rm item-filter-list">
             <li class="oc-my-xs">
-              <button class="oc-button oc-rounded oc-button-m oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw item-filter-list-item oc-flex oc-flex-left oc-flex-middle oc-width-1-1 oc-p-xs" type="button">
+              <button class="oc-button oc-rounded oc-button-m oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw item-filter-list-item oc-flex oc-flex-left oc-flex-middle oc-width-1-1 oc-p-xs" data-test-value="Albert Einstein" type="button">
                 <!-- @slot Content of the button -->
                 <div>
                   <oc-checkbox-stub class="item-filter-checkbox" disabled="false" hidelabel="true" id="oc-checkbox-7" label="Toggle selection" modelvalue="false" outline="false" size="large"></oc-checkbox-stub>
@@ -28,7 +28,7 @@ exports[`ItemFilter can use a custom attribute as display name 1`] = `
               </button>
             </li>
             <li class="oc-my-xs">
-              <button class="oc-button oc-rounded oc-button-m oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw item-filter-list-item oc-flex oc-flex-left oc-flex-middle oc-width-1-1 oc-p-xs" type="button">
+              <button class="oc-button oc-rounded oc-button-m oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw item-filter-list-item oc-flex oc-flex-left oc-flex-middle oc-width-1-1 oc-p-xs" data-test-value="Marie Curie" type="button">
                 <!-- @slot Content of the button -->
                 <div>
                   <oc-checkbox-stub class="item-filter-checkbox" disabled="false" hidelabel="true" id="oc-checkbox-8" label="Toggle selection" modelvalue="false" outline="false" size="large"></oc-checkbox-stub>
@@ -64,7 +64,7 @@ exports[`ItemFilter renders all items 1`] = `
         <div>
           <ul class="oc-list oc-my-rm oc-mx-rm item-filter-list">
             <li class="oc-my-xs">
-              <button class="oc-button oc-rounded oc-button-m oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw item-filter-list-item oc-flex oc-flex-left oc-flex-middle oc-width-1-1 oc-p-xs" type="button">
+              <button class="oc-button oc-rounded oc-button-m oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw item-filter-list-item oc-flex oc-flex-left oc-flex-middle oc-width-1-1 oc-p-xs" data-test-value="Albert Einstein" type="button">
                 <!-- @slot Content of the button -->
                 <div>
                   <oc-checkbox-stub class="item-filter-checkbox" disabled="false" hidelabel="true" id="oc-checkbox-3" label="Toggle selection" modelvalue="false" outline="false" size="large"></oc-checkbox-stub>
@@ -74,7 +74,7 @@ exports[`ItemFilter renders all items 1`] = `
               </button>
             </li>
             <li class="oc-my-xs">
-              <button class="oc-button oc-rounded oc-button-m oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw item-filter-list-item oc-flex oc-flex-left oc-flex-middle oc-width-1-1 oc-p-xs" type="button">
+              <button class="oc-button oc-rounded oc-button-m oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw item-filter-list-item oc-flex oc-flex-left oc-flex-middle oc-width-1-1 oc-p-xs" data-test-value="Marie Curie" type="button">
                 <!-- @slot Content of the button -->
                 <div>
                   <oc-checkbox-stub class="item-filter-checkbox" disabled="false" hidelabel="true" id="oc-checkbox-4" label="Toggle selection" modelvalue="false" outline="false" size="large"></oc-checkbox-stub>
diff --git a/tests/e2e/cucumber/features/smoke/admin-settings/users.ocis.feature b/tests/e2e/cucumber/features/smoke/admin-settings/users.ocis.feature
index 5754940590f..8b89aa42ca9 100644
--- a/tests/e2e/cucumber/features/smoke/admin-settings/users.ocis.feature
+++ b/tests/e2e/cucumber/features/smoke/admin-settings/users.ocis.feature
@@ -31,7 +31,7 @@ Feature: spaces management
     And "Admin" navigates to the users management page
     When "Admin" changes the quota of the user "Alice" to "500"
     Then "Alice" should have quota "500"
-    When "Admin" changes the quota using a batch action to "20" for users: 
+    When "Admin" changes the quota using a batch action to "20" for users:
       | id    |
       | Alice |
       | Brian |
@@ -41,3 +41,43 @@ Feature: spaces management
     And "Alice" logs out
     And "Admin" logs out
 
+
+  Scenario: user group assignments can be handled via batch actions
+    Given "Admin" creates following users
+      | id    |
+      | Alice |
+      | Brian |
+      | Carol |
+    And "Admin" creates following groups
+      | id      |
+      | sales   |
+      | finance |
+    When "Admin" logs in
+    And "Admin" opens the "admin-settings" app
+    And "Admin" navigates to the users management page
+    And "Admin" adds the following users to the groups "sales department,finance department" using the batch actions
+      | user  |
+      | Alice |
+      | Brian |
+      | Carol |
+    When "Admin" sets the following filter
+      | filter | values                              |
+      | groups | sales department,finance department |
+    Then "Admin" should see the following users
+      | user  |
+      | Alice |
+      | Brian |
+      | Carol |
+    And "Admin" removes the following users from the groups "sales department,finance department" using the batch actions
+      | user  |
+      | Alice |
+      | Brian |
+    When "Admin" reloads the page
+    Then "Admin" should see the following users
+      | user  |
+      | Carol |
+    Then "Admin" should not see the following users
+      | user  |
+      | Alice |
+      | Brian |
+    And "Admin" logs out
diff --git a/tests/e2e/cucumber/steps/ui/adminSettings.ts b/tests/e2e/cucumber/steps/ui/adminSettings.ts
index 5a25f63fc46..2411601f1de 100644
--- a/tests/e2e/cucumber/steps/ui/adminSettings.ts
+++ b/tests/e2e/cucumber/steps/ui/adminSettings.ts
@@ -173,3 +173,72 @@ When(
     await usersObject.changeQuotaUsingBatchAction({ value })
   }
 )
+
+Then(
+  /^"([^"]*)" (should see|should not see) the following user(s)$/,
+  async function (
+    this: World,
+    stepUser: string,
+    action: string,
+    _: string,
+    stepTable: DataTable
+  ): Promise<void> {
+    const { page } = this.actorsEnvironment.getActor({ key: stepUser })
+    const usersObject = new objects.applicationAdminSettings.Users({ page })
+    const users = await usersObject.getDisplayedUsers()
+    for (const { user } of stepTable.hashes()) {
+      switch (action) {
+        case 'should see':
+          expect(users).toContain(usersObject.getUUID({ key: user }))
+          break
+        case 'should not see':
+          expect(users).not.toContain(usersObject.getUUID({ key: user }))
+          break
+        default:
+          throw new Error(`${action} not implemented`)
+      }
+    }
+  }
+)
+
+Then(
+  '{string} sets the following filter(s)',
+  async function (this: World, stepUser: string, stepTable: DataTable): Promise<void> {
+    const { page } = this.actorsEnvironment.getActor({ key: stepUser })
+    const usersObject = new objects.applicationAdminSettings.Users({ page })
+
+    for (const { filter, values } of stepTable.hashes()) {
+      await usersObject.filter({ filter, values: values.split(',') })
+    }
+  }
+)
+
+When(
+  /^"([^"]*)" (adds|removes) the following users (to|from) the groups "([^"]*)" using the batch actions$/,
+  async function (
+    this: World,
+    stepUser: string,
+    action: string,
+    _: string,
+    groups: string,
+    stepTable: DataTable
+  ): Promise<void> {
+    const { page } = this.actorsEnvironment.getActor({ key: stepUser })
+    const usersObject = new objects.applicationAdminSettings.Users({ page })
+
+    for (const { user } of stepTable.hashes()) {
+      await usersObject.select({ key: user })
+    }
+
+    switch (action) {
+      case 'adds':
+        await usersObject.addToGroups({ groups: groups.split(',') })
+        break
+      case 'removes':
+        await usersObject.removeFromGroups({ groups: groups.split(',') })
+        break
+      default:
+        throw new Error(`${action} not implemented`)
+    }
+  }
+)
diff --git a/tests/e2e/cucumber/steps/ui/application.ts b/tests/e2e/cucumber/steps/ui/application.ts
index b8b10949e58..636b7278124 100644
--- a/tests/e2e/cucumber/steps/ui/application.ts
+++ b/tests/e2e/cucumber/steps/ui/application.ts
@@ -12,6 +12,12 @@ When(
   }
 )
 
+When('{string} reloads the page', async function (this: World, stepUser: string): Promise<void> {
+  const { page } = this.actorsEnvironment.getActor({ key: stepUser })
+  const applicationObject = new objects.runtime.Application({ page })
+  await applicationObject.reloadPage()
+})
+
 Then(
   /^"([^"]*)" should have quota "([^"]*)"$/,
   async function (this: World, stepUser: string, quota: string): Promise<void> {
diff --git a/tests/e2e/support/objects/app-admin-settings/users/actions.ts b/tests/e2e/support/objects/app-admin-settings/users/actions.ts
index 0edc87dfd6d..ba44ab17353 100644
--- a/tests/e2e/support/objects/app-admin-settings/users/actions.ts
+++ b/tests/e2e/support/objects/app-admin-settings/users/actions.ts
@@ -4,12 +4,20 @@ import util from 'util'
 const userIdSelector = `[data-item-id="%s"] .users-table-btn-action-dropdown`
 const editActionBtn = `.oc-users-actions-edit-trigger`
 const loginDropDown = '.vs__dropdown-menu'
-const loginValueDropDownOption = '.vs__dropdown-option'
+const dropdownOption = '.vs__dropdown-option'
 const loginInput = '#login-input'
-const actionConfirmButton = '.compare-save-dialog-confirm-btn'
+const compareDialogConfirm = '.compare-save-dialog-confirm-btn'
+const addToGroupsBatchAction = '.oc-users-actions-add-to-groups-trigger'
+const removeFromGroupsBatchAction = '.oc-users-actions-remove-from-groups-trigger'
+const groupsModalInput = '.oc-modal .vs__search'
+const actionConfirmButton = '.oc-modal-body-actions-confirm'
+const userTrSelector = 'tr'
+const userFilter = '.item-filter-%s'
+const userFilterOption = '//ul[contains(@class, "item-filter-list")]//button[@data-test-value="%s"]'
+const usersTable = '.users-table'
 const quotaInput = '#quota-select-form .vs__search'
 const quotaValueDropDown = `.vs__dropdown-option :text-is("%s")`
-const userCheckboxSelector = `//*[@data-test-user-name="%s"]//ancestor::tr//input`
+const userCheckboxSelector = `[data-item-id="%s"]:not(.oc-table-highlighted) input[type=checkbox]`
 const editQuotaBtn = '.oc-files-actions-edit-quota-trigger'
 const quotaInputBatchAction = '#quota-select-batch-action-form .vs__search'
 const confirmChangeQuotaSeveralSpacesBtn = '.oc-modal-body-actions-confirm'
@@ -29,7 +37,7 @@ export const changeAccountEnabled = async (args: {
   await page.waitForSelector(loginDropDown)
 
   await page
-    .locator(loginValueDropDownOption)
+    .locator(dropdownOption)
     .getByText(value === false ? 'Forbidden' : 'Allowed')
     .click()
 
@@ -40,7 +48,7 @@ export const changeAccountEnabled = async (args: {
         resp.status() === 200 &&
         resp.request().method() === 'PATCH'
     ),
-    await page.locator(actionConfirmButton).click()
+    await page.locator(compareDialogConfirm).click()
   ])
 }
 
@@ -62,20 +70,10 @@ export const changeQuota = async (args: {
         resp.status() === 200 &&
         resp.request().method() === 'PATCH'
     ),
-    await page.locator(actionConfirmButton).click()
+    await page.locator(compareDialogConfirm).click()
   ])
 }
 
-export const selectUser = async (args: { page: Page; displayName: string }): Promise<void> => {
-  const { page, displayName } = args
-  const checkbox = await page.locator(util.format(userCheckboxSelector, displayName))
-  const checkBoxAlreadySelected = await checkbox.isChecked()
-  if (checkBoxAlreadySelected) {
-    return
-  }
-  await checkbox.click()
-}
-
 export const changeQuotaUsingBatchAction = async (args: {
   page: Page
   value: string
@@ -90,3 +88,73 @@ export const changeQuotaUsingBatchAction = async (args: {
     page.locator(confirmChangeQuotaSeveralSpacesBtn).click()
   ])
 }
+
+export const getDisplayedUsers = async (args: { page: Page }): Promise<string[]> => {
+  const { page } = args
+  const users = []
+  await page.waitForSelector(usersTable)
+  const result = page.locator(userTrSelector)
+
+  const count = await result.count()
+  for (let i = 0; i < count; i++) {
+    users.push(await result.nth(i).getAttribute('data-item-id'))
+  }
+
+  return users
+}
+
+export const selectUser = async (args: { page: Page; uuid: string }): Promise<void> => {
+  const { page, uuid } = args
+  const checkbox = await page.locator(util.format(userCheckboxSelector, uuid))
+  const checkBoxAlreadySelected = !(await checkbox.isVisible())
+  if (checkBoxAlreadySelected) {
+    return
+  }
+  await checkbox.click()
+}
+
+export const addSelectedUsersToGroups = async (args: {
+  page: Page
+  groups: string[]
+}): Promise<void> => {
+  const { page, groups } = args
+  await page.locator(addToGroupsBatchAction).click()
+  for (const group of groups) {
+    await page.locator(groupsModalInput).click()
+    await page.locator(dropdownOption).getByText(group).click()
+  }
+  await page.locator(actionConfirmButton).click()
+}
+
+export const removeSelectedUsersFromGroups = async (args: {
+  page: Page
+  groups: string[]
+}): Promise<void> => {
+  const { page, groups } = args
+  await page.locator(removeFromGroupsBatchAction).click()
+  for (const group of groups) {
+    await page.locator(groupsModalInput).click()
+    await page.locator(dropdownOption).getByText(group).click()
+  }
+  await page.locator(actionConfirmButton).click()
+}
+
+export const filterUsers = async (args: {
+  page: Page
+  filter: string
+  values: string[]
+}): Promise<void> => {
+  const { page, filter, values } = args
+  await page.locator(util.format(userFilter, filter)).click()
+  for (const value of values) {
+    await Promise.all([
+      page.waitForResponse(
+        (resp) =>
+          resp.url().includes('/users') &&
+          resp.status() === 200 &&
+          resp.request().method() === 'GET'
+      ),
+      page.locator(util.format(userFilterOption, value)).click()
+    ])
+  }
+}
diff --git a/tests/e2e/support/objects/app-admin-settings/users/index.ts b/tests/e2e/support/objects/app-admin-settings/users/index.ts
index e229889302a..6d23b0dddb8 100644
--- a/tests/e2e/support/objects/app-admin-settings/users/index.ts
+++ b/tests/e2e/support/objects/app-admin-settings/users/index.ts
@@ -1,10 +1,14 @@
 import { Page } from 'playwright'
 import { UsersEnvironment } from '../../../environment'
 import {
+  addSelectedUsersToGroups,
   changeAccountEnabled,
-  selectUser,
   changeQuota,
-  changeQuotaUsingBatchAction
+  changeQuotaUsingBatchAction,
+  filterUsers,
+  getDisplayedUsers,
+  removeSelectedUsersFromGroups,
+  selectUser
 } from './actions'
 
 export class Users {
@@ -14,6 +18,10 @@ export class Users {
     this.#usersEnvironment = new UsersEnvironment()
     this.#page = page
   }
+  getUUID({ key }: { key: string }) {
+    const { uuid } = this.#usersEnvironment.getUser({ key })
+    return uuid
+  }
   async allowLogin({ key }: { key: string }): Promise<void> {
     const { uuid } = this.#usersEnvironment.getUser({ key })
     await changeAccountEnabled({ uuid, value: true, page: this.#page })
@@ -27,10 +35,26 @@ export class Users {
     await changeQuota({ uuid, value, page: this.#page })
   }
   async selectUser({ key }: { key: string }): Promise<void> {
-    const { displayName } = this.#usersEnvironment.getUser({ key })
-    await selectUser({ displayName, page: this.#page })
+    const { uuid } = this.#usersEnvironment.getUser({ key })
+    await selectUser({ uuid, page: this.#page })
   }
   async changeQuotaUsingBatchAction({ value }: { value: string }): Promise<void> {
     await changeQuotaUsingBatchAction({ value, page: this.#page })
   }
+  getDisplayedUsers(): Promise<string[]> {
+    return getDisplayedUsers({ page: this.#page })
+  }
+  async select({ key }: { key: string }): Promise<void> {
+    const { uuid } = this.#usersEnvironment.getUser({ key })
+    await selectUser({ uuid, page: this.#page })
+  }
+  async addToGroups({ groups }: { groups: string[] }): Promise<void> {
+    await addSelectedUsersToGroups({ page: this.#page, groups })
+  }
+  async removeFromGroups({ groups }: { groups: string[] }): Promise<void> {
+    await removeSelectedUsersFromGroups({ page: this.#page, groups })
+  }
+  async filter({ filter, values }: { filter: string; values: string[] }): Promise<void> {
+    await filterUsers({ page: this.#page, filter, values })
+  }
 }
diff --git a/tests/e2e/support/objects/runtime/application.ts b/tests/e2e/support/objects/runtime/application.ts
index 4e6025f77fc..874d4ff462f 100644
--- a/tests/e2e/support/objects/runtime/application.ts
+++ b/tests/e2e/support/objects/runtime/application.ts
@@ -10,6 +10,10 @@ export class Application {
     this.#page = page
   }
 
+  async reloadPage(): Promise<void> {
+    await this.#page.reload()
+  }
+
   async open({ name }: { name: string }): Promise<void> {
     await this.#page.locator(appSwitcherButton).click()
     await this.#page.locator(util.format(appSelector, name, name)).click()