diff --git a/changelog/unreleased/enhancement-requests-language-header b/changelog/unreleased/enhancement-requests-language-header
index 98669d4a78c..dd462b48ef8 100644
--- a/changelog/unreleased/enhancement-requests-language-header
+++ b/changelog/unreleased/enhancement-requests-language-header
@@ -4,3 +4,4 @@ All outgoing requests now have the `Accept-Language` header which includes the c
 
 https://github.com/owncloud/web/issues/8612
 https://github.com/owncloud/web/pull/8621
+https://github.com/owncloud/web/pull/8660
diff --git a/packages/web-app-admin-settings/src/components/Users/CreateUserModal.vue b/packages/web-app-admin-settings/src/components/Users/CreateUserModal.vue
index ff28790978e..7604d06eae3 100644
--- a/packages/web-app-admin-settings/src/components/Users/CreateUserModal.vue
+++ b/packages/web-app-admin-settings/src/components/Users/CreateUserModal.vue
@@ -55,12 +55,13 @@
 <script lang="ts">
 import { defineComponent, ref } from 'vue'
 import * as EmailValidator from 'email-validator'
-import { useGraphClient } from 'web-pkg'
+import { useClientService } from 'web-pkg'
 
 export default defineComponent({
   name: 'CreateUserModal',
   emits: ['cancel', 'confirm'],
   setup() {
+    const clientService = useClientService()
     const formData = ref({
       userName: {
         errorMessage: '',
@@ -80,7 +81,7 @@ export default defineComponent({
       }
     })
     return {
-      ...useGraphClient(),
+      clientService,
       formData
     }
   },
@@ -134,16 +135,14 @@ export default defineComponent({
       }
 
       try {
-        await this.graphClient.users.getUser(this.user.onPremisesSamAccountName)
+        // Validate username by fetching the user. If the request succeeds, we throw a validation error
+        const client = this.clientService.graphAuthenticated
+        await client.users.getUser(this.user.onPremisesSamAccountName)
         this.formData.userName.errorMessage = this.$gettext('User "%{userName}" already exists', {
           userName: this.user.onPremisesSamAccountName
         })
         return false
-      } catch (e) {
-        /**
-         * If the backend throws an error, the user doesn't exist and everything is alright
-         */
-      }
+      } catch (e) {}
 
       this.formData.userName.errorMessage = ''
       this.formData.userName.valid = true
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 1ba277a219c..3c6a7b6ba5d 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
@@ -115,7 +115,7 @@ 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'
-import { MaybeRef, useGraphClient, useStore } from 'web-pkg'
+import { MaybeRef, useClientService, useStore } from 'web-pkg'
 import { useCapabilitySpacesMaxQuota } from 'web-pkg/src/composables'
 
 export default defineComponent({
@@ -144,6 +144,7 @@ export default defineComponent({
   emits: ['confirm'],
   setup(props) {
     const store = useStore()
+    const clientService = useClientService()
     const currentUser = store.getters.user
     const editUser: MaybeRef<User> = ref({})
     const formData = ref({
@@ -173,7 +174,7 @@ export default defineComponent({
       editUser,
       formData,
       groupOptions,
-      ...useGraphClient(),
+      clientService,
       // HACK: make sure _user has a proper type
       _user: computed(() => props.user as User)
     }
@@ -271,16 +272,14 @@ export default defineComponent({
 
       if (this.user.onPremisesSamAccountName !== this.editUser.onPremisesSamAccountName) {
         try {
-          await this.graphClient.users.getUser(this.editUser.onPremisesSamAccountName)
+          // Validate username by fetching the user. If the request succeeds, we throw a validation error
+          const client = this.clientService.graphAuthenticated
+          await client.users.getUser(this.editUser.onPremisesSamAccountName)
           this.formData.userName.errorMessage = this.$gettext('User "%{userName}" already exists', {
             userName: this.editUser.onPremisesSamAccountName
           })
           return false
-        } catch (e) {
-          /**
-           * If the backend throws an error, the user doesn't exist and everything is alright
-           */
-        }
+        } catch (e) {}
       }
 
       this.formData.userName.errorMessage = ''
diff --git a/packages/web-app-admin-settings/src/views/Groups.vue b/packages/web-app-admin-settings/src/views/Groups.vue
index d8ed440b2eb..70746199dd2 100644
--- a/packages/web-app-admin-settings/src/views/Groups.vue
+++ b/packages/web-app-admin-settings/src/views/Groups.vue
@@ -89,7 +89,7 @@ import { eventBus } from 'web-pkg/src/services/eventBus'
 import { mapActions } from 'vuex'
 import DetailsPanel from '../components/Groups/SideBar/DetailsPanel.vue'
 import EditPanel from '../components/Groups/SideBar/EditPanel.vue'
-import { useGraphClient } from 'web-pkg/src/composables'
+import { useClientService } from 'web-pkg/src/composables'
 import AppTemplate from '../components/AppTemplate.vue'
 import { useSideBar } from 'web-pkg/src/composables/sideBar'
 import Delete from '../mixins/groups/delete'
@@ -111,10 +111,10 @@ export default defineComponent({
     const selectedGroups = ref([])
     const createGroupModalOpen = ref(false)
     const listHeaderPosition = ref(0)
-    const { graphClient } = useGraphClient()
+    const clientService = useClientService()
 
     const loadResourcesTask = useTask(function* (signal) {
-      const response = yield unref(graphClient).groups.listGroups('displayName')
+      const response = yield clientService.graphAuthenticated.groups.listGroups('displayName')
       groups.value = response.data.value || []
       groups.value.forEach((group) => {
         group.members = group.members || []
@@ -152,7 +152,7 @@ export default defineComponent({
       createGroupModalOpen,
       template,
       loadResourcesTask,
-      graphClient,
+      clientService,
       listHeaderPosition,
       batchActions
     }
@@ -225,7 +225,8 @@ export default defineComponent({
     },
     async createGroup(group) {
       try {
-        const response = await this.graphClient.groups.createGroup(group)
+        const client = this.clientService.graphAuthenticated
+        const response = await client.groups.createGroup(group)
         this.toggleCreateGroupModal()
         this.showMessage({
           title: this.$gettext('Group was created successfully')
@@ -241,7 +242,8 @@ export default defineComponent({
     },
     async editGroup(editGroup) {
       try {
-        await this.graphClient.groups.editGroup(editGroup.id, editGroup)
+        const client = this.clientService.graphAuthenticated
+        await client.groups.editGroup(editGroup.id, editGroup)
         const group = this.groups.find((group) => group.id === editGroup.id)
         Object.assign(group, editGroup)
 
diff --git a/packages/web-app-admin-settings/src/views/Spaces.vue b/packages/web-app-admin-settings/src/views/Spaces.vue
index a310a496301..e5dfb654901 100644
--- a/packages/web-app-admin-settings/src/views/Spaces.vue
+++ b/packages/web-app-admin-settings/src/views/Spaces.vue
@@ -78,7 +78,7 @@ import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
 import {
   useAccessToken,
   useCapabilitySpacesMaxQuota,
-  useGraphClient,
+  useClientService,
   useStore
 } from 'web-pkg/src/composables'
 import {
@@ -132,7 +132,7 @@ export default defineComponent({
     const store = useStore()
     const accessToken = useAccessToken({ store })
     const spaces = ref([])
-    const { graphClient } = useGraphClient()
+    const clientService = useClientService()
     const { $gettext } = useGettext()
     const { sideBarOpen, sideBarActivePanel } = useSideBar()
 
@@ -145,7 +145,10 @@ export default defineComponent({
     const loadResourcesTask = useTask(function* (signal) {
       const {
         data: { value: drivesResponse }
-      } = yield unref(graphClient).drives.listAllDrives('name asc', 'driveType eq project')
+      } = yield clientService.graphAuthenticated.drives.listAllDrives(
+        'name asc',
+        'driveType eq project'
+      )
       const drives = drivesResponse.map((space) =>
         buildSpace({ ...space, serverUrl: configurationManager.serverUrl })
       )
@@ -290,7 +293,6 @@ export default defineComponent({
       sideBarActivePanel,
       spaces,
       loadResourcesTask,
-      graphClient,
       accessToken,
       breadcrumbs,
       batchActions,
diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
index 1dde6fbebdc..dab6e9b4046 100644
--- a/packages/web-app-admin-settings/src/views/Users.vue
+++ b/packages/web-app-admin-settings/src/views/Users.vue
@@ -170,7 +170,7 @@ import {
   queryItemAsString,
   useAccessToken,
   useCapabilitySpacesMaxQuota,
-  useGraphClient,
+  useClientService,
   useLoadingService,
   useRouteQuery,
   useStore
@@ -221,7 +221,7 @@ export default defineComponent({
     const { $gettext } = useGettext()
     const store = useStore()
     const accessToken = useAccessToken({ store })
-    const { graphClient } = useGraphClient()
+    const clientService = useClientService()
     const loadingService = useLoadingService()
 
     const { actions: removeFromGroupsActions } = useRemoveFromGroups()
@@ -260,12 +260,13 @@ export default defineComponent({
     }
 
     const loadGroupsTask = useTask(function* (signal) {
-      const groupsResponse = yield unref(graphClient).groups.listGroups('displayName')
+      const groupsResponse = yield clientService.graphAuthenticated.groups.listGroups('displayName')
       groups.value = groupsResponse.data.value
     })
 
     const loadAppRolesTask = useTask(function* (signal) {
-      const applicationsResponse = yield unref(graphClient).applications.listApplications()
+      const applicationsResponse =
+        yield clientService.graphAuthenticated.applications.listApplications()
       roles.value = applicationsResponse.data.value[0].appRoles
       applicationId.value = applicationsResponse.data.value[0].id
     })
@@ -284,7 +285,10 @@ export default defineComponent({
         .filter(Boolean)
         .join(' and ')
 
-      const usersResponse = yield unref(graphClient).users.listUsers('displayName', filter)
+      const usersResponse = yield clientService.graphAuthenticated.users.listUsers(
+        'displayName',
+        filter
+      )
       users.value = usersResponse.data.value || []
     })
 
@@ -307,7 +311,7 @@ export default defineComponent({
         return
       }
 
-      const { data } = yield unref(graphClient).users.getUser(user.id)
+      const { data } = yield clientService.graphAuthenticated.users.getUser(user.id)
       unref(additionalUserDataLoadedForUserIds).push(user.id)
 
       Object.assign(user, data)
@@ -417,18 +421,13 @@ export default defineComponent({
 
     const addUsersToGroups = async ({ users: affectedUsers, groups: groupsToAdd }) => {
       try {
+        const client = clientService.graphAuthenticated
         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
-                )
-              )
+              acc.push(client.groups.addMember(group.id, user.id, configurationManager.serverUrl))
               if (!usersToFetch.includes(user.id)) {
                 usersToFetch.push(user.id)
               }
@@ -438,7 +437,7 @@ export default defineComponent({
         }, addUsersToGroupsRequests)
         const usersResponse = await loadingService.addTask(async () => {
           await Promise.all(addUsersToGroupsRequests)
-          return Promise.all(usersToFetch.map((userId) => unref(graphClient).users.getUser(userId)))
+          return Promise.all(usersToFetch.map((userId) => client.users.getUser(userId)))
         })
         for (const { data: updatedUser } of usersResponse) {
           const userIndex = unref(users).findIndex((user) => user.id === updatedUser.id)
@@ -466,12 +465,13 @@ export default defineComponent({
 
     const removeUsersFromGroups = async ({ users: affectedUsers, groups: groupsToRemove }) => {
       try {
+        const client = clientService.graphAuthenticated
         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))
+              acc.push(client.groups.deleteMember(group.id, user.id))
               if (!usersToFetch.includes(user.id)) {
                 usersToFetch.push(user.id)
               }
@@ -481,7 +481,7 @@ export default defineComponent({
         }, removeUsersToGroupsRequests)
         const usersResponse = await loadingService.addTask(async () => {
           await Promise.all(removeUsersToGroupsRequests)
-          return Promise.all(usersToFetch.map((userId) => unref(graphClient).users.getUser(userId)))
+          return Promise.all(usersToFetch.map((userId) => client.users.getUser(userId)))
         })
         for (const { data: updatedUser } of usersResponse) {
           const userIndex = unref(users).findIndex((user) => user.id === updatedUser.id)
@@ -519,7 +519,7 @@ export default defineComponent({
       applicationId,
       loadResourcesTask,
       loadAdditionalUserDataTask,
-      graphClient,
+      clientService,
       accessToken,
       listHeaderPosition,
       createUserModalOpen,
@@ -615,8 +615,9 @@ export default defineComponent({
     },
     async createUser(user) {
       try {
-        const { id: createdUserId } = (await this.graphClient.users.createUser(user))?.data
-        const { data: createdUser } = await this.graphClient.users.getUser(createdUserId)
+        const client = this.clientService.graphAuthenticated
+        const { id: createdUserId } = (await client.users.createUser(user))?.data
+        const { data: createdUser } = await client.users.getUser(createdUserId)
         this.users.push(createdUser)
 
         this.toggleCreateUserModal()
@@ -633,6 +634,7 @@ export default defineComponent({
     },
     async editUser({ user, editUser }) {
       try {
+        const client = this.clientService.graphAuthenticated
         const graphEditUserPayloadExtractor = (user) => {
           return omit(user, ['drive', 'appRoleAssignments', 'memberOf'])
         }
@@ -642,7 +644,7 @@ export default defineComponent({
         )
 
         if (!isEmpty(graphEditUserPayload)) {
-          await this.graphClient.users.editUser(editUser.id, graphEditUserPayload)
+          await client.users.editUser(editUser.id, graphEditUserPayload)
         }
 
         if (!isEqual(user.drive?.quota?.total, editUser.drive?.quota?.total)) {
@@ -659,7 +661,7 @@ export default defineComponent({
           await this.updateUserAppRoleAssignments(user, editUser)
         }
 
-        const { data: updatedUser } = await this.graphClient.users.getUser(user.id)
+        const { data: updatedUser } = await client.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)
@@ -681,7 +683,8 @@ export default defineComponent({
     },
 
     async updateUserDrive(editUser) {
-      const updateDriveResponse = await this.graphClient.drives.updateDrive(
+      const client = this.clientService.graphAuthenticated
+      const updateDriveResponse = await client.drives.updateDrive(
         editUser.drive.id,
         { quota: { total: editUser.drive.quota.total } },
         {}
@@ -697,13 +700,15 @@ export default defineComponent({
       }
     },
     updateUserAppRoleAssignments(user, editUser) {
-      return this.graphClient.users.createUserAppRoleAssignment(user.id, {
+      const client = this.clientService.graphAuthenticated
+      return client.users.createUserAppRoleAssignment(user.id, {
         appRoleId: editUser.appRoleAssignments[0].appRoleId,
         resourceId: this.applicationId,
         principalId: editUser.id
       })
     },
     updateUserGroupAssignments(user, editUser) {
+      const client = this.clientService.graphAuthenticated
       const groupsToAdd = editUser.memberOf.filter(
         (editUserGroup) => !user.memberOf.some((g) => g.id === editUserGroup.id)
       )
@@ -714,11 +719,11 @@ export default defineComponent({
 
       for (const groupToAdd of groupsToAdd) {
         requests.push(
-          this.graphClient.groups.addMember(groupToAdd.id, user.id, configurationManager.serverUrl)
+          client.groups.addMember(groupToAdd.id, user.id, configurationManager.serverUrl)
         )
       }
       for (const groupToDelete of groupsToDelete) {
-        requests.push(this.graphClient.groups.deleteMember(groupToDelete.id, user.id))
+        requests.push(client.groups.deleteMember(groupToDelete.id, user.id))
       }
 
       return Promise.all(requests)
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 89f9127892e..1757eb7736f 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -149,7 +149,7 @@ import {
   useCapabilitySpacesEnabled,
   useStore,
   useUserContext,
-  useGraphClient
+  useClientService
 } from 'web-pkg/src/composables'
 
 import ResourceUpload from './Upload/ResourceUpload.vue'
@@ -202,6 +202,7 @@ export default defineComponent({
   setup(props) {
     const instance = getCurrentInstance().proxy as any
     const uppyService = useService<UppyService>('$uppyService')
+    const clientService = useClientService()
     const store = useStore()
     let filesSelectedSub
     let uploadCompletedSub
@@ -234,7 +235,7 @@ export default defineComponent({
         currentFolderId: computed(() => props.itemId)
       }),
       ...useRequest(),
-      ...useGraphClient(),
+      clientService,
       isPublicLocation: useActiveLocation(isLocationPublicActive, 'files-public-link'),
       isSpacesGenericLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-generic'),
       hasShareJail: useCapabilityShareJailEnabled(),
@@ -338,7 +339,7 @@ export default defineComponent({
     pasteFilesHere() {
       this.pasteSelectedFiles({
         targetSpace: this.space,
-        clientService: this.$clientService,
+        clientService: this.clientService,
         loadingService: this.$loadingService,
         createModal: this.createModal,
         hideModal: this.hideModal,
@@ -362,7 +363,8 @@ export default defineComponent({
         const { spaceId, currentFolder, currentFolderId } = file.meta
         if (!['public', 'share'].includes(file.meta.driveType)) {
           if (this.hasSpaces) {
-            const driveResponse = await this.graphClient.drives.getDrive(spaceId)
+            const client = this.clientService.graphAuthenticated
+            const driveResponse = await client.drives.getDrive(spaceId)
             this.UPDATE_SPACE_FIELD({
               id: driveResponse.data.id,
               field: 'spaceQuota',
diff --git a/packages/web-app-files/src/components/AppBar/CreateSpace.vue b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
index 8a7749e1ec9..f017e4b1c60 100644
--- a/packages/web-app-files/src/components/AppBar/CreateSpace.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
@@ -17,16 +17,16 @@
 import { mapActions, mapMutations } from 'vuex'
 
 import { defineComponent } from 'vue'
-import { useGraphClient } from 'web-pkg/src/composables'
 import { buildSpace } from 'web-client/src/helpers'
 import { configurationManager } from 'web-pkg/src/configuration'
 import { WebDAV } from 'web-client/src/webdav'
+import { useClientService } from 'web-pkg/src/composables'
+import { Drive } from 'web-client/src/generated'
 
 export default defineComponent({
   setup() {
-    return {
-      ...useGraphClient()
-    }
+    const clientService = useClientService()
+    return { clientService }
   },
   methods: {
     ...mapActions(['showMessage', 'createModal', 'hideModal', 'setModalInputErrorMessage']),
@@ -69,7 +69,8 @@ export default defineComponent({
 
     async addNewSpace(name) {
       try {
-        const { data: space } = await this.graphClient.drives.createDrive({ name }, {})
+        const client = this.clientService.graphAuthenticated
+        const { data: space } = await client.drives.createDrive({ name }, {})
         this.hideModal()
         const resource = buildSpace({ ...space, serverUrl: configurationManager.serverUrl })
         this.UPSERT_RESOURCE(resource)
@@ -81,7 +82,7 @@ export default defineComponent({
           content: this.$gettext('Here you can add a description for this Space.')
         })
 
-        const { data: updatedSpace } = await this.graphClient.drives.updateDrive(
+        const { data: updatedSpace } = await client.drives.updateDrive(
           space.id,
           {
             special: [
@@ -92,7 +93,7 @@ export default defineComponent({
                 id: markdown.id as string
               }
             ]
-          },
+          } as Drive,
           {}
         )
         this.UPDATE_RESOURCE_FIELD({
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
index 9d2023264ae..fda77a181ce 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -87,10 +87,10 @@ import {
   useCapabilityFilesSharingResharing,
   useCapabilityFilesSharingResharingDefault,
   useCapabilityShareJailEnabled,
+  useClientService,
   useStore
 } from 'web-pkg/src/composables'
 
-import { useGraphClient } from 'web-pkg/src/composables'
 import { defineComponent, inject } from 'vue'
 import { Resource } from 'web-client'
 import { useShares } from 'web-app-files/src/composables'
@@ -123,6 +123,7 @@ export default defineComponent({
 
   setup() {
     const store = useStore()
+    const clientService = useClientService()
     return {
       resource: inject<Resource>('resource'),
       hasResharing: useCapabilityFilesSharingResharing(store),
@@ -130,7 +131,7 @@ export default defineComponent({
       hasShareJail: useCapabilityShareJailEnabled(store),
       hasRoleCustomPermissions: useCapabilityFilesSharingAllowCustomPermissions(store),
       hasRoleDenyAccess: useCapabilityFilesSharingCanDenyAccess(store),
-      ...useGraphClient(),
+      clientService,
       ...useShares()
     }
   },
@@ -320,7 +321,7 @@ export default defineComponent({
             addMethod({
               ...this.$language,
               client: this.$client,
-              graphClient: this.graphClient,
+              graphClient: this.clientService.graphAuthenticated,
               path,
               shareWith: collaborator.value.shareWith,
               displayName: collaborator.label,
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
index 0bc9a85ee82..323f7380e10 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
@@ -115,7 +115,7 @@ import { extractDomSelector } from 'web-client/src/helpers/resource'
 import { defineComponent } from 'vue'
 import * as uuid from 'uuid'
 import { formatDateFromDateTime, formatRelativeDateFromDateTime } from 'web-pkg/src/helpers'
-import { useGraphClient } from 'web-pkg/src/composables'
+import { useClientService } from 'web-pkg/src/composables'
 
 export default defineComponent({
   name: 'ListItem',
@@ -139,10 +139,11 @@ export default defineComponent({
   },
   emits: ['onDelete'],
   setup() {
+    const clientService = useClientService()
     return {
       hasResharing: useCapabilityFilesSharingResharing(),
       resharingDefault: useCapabilityFilesSharingResharingDefault(),
-      ...useGraphClient()
+      clientService
     }
   },
   computed: {
@@ -369,7 +370,7 @@ export default defineComponent({
       changeMethod({
         ...this.$language,
         client: this.$client,
-        graphClient: this.graphClient,
+        graphClient: this.clientService.graphAuthenticated,
         share: this.share,
         permissions: bitmask,
         expirationDate: expirationDate || '',
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
index d6f0eb6ef99..8d153db5f08 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -125,7 +125,6 @@ import { LinkShareRoles, SharePermissions } from 'web-client/src/helpers/share'
 import { showQuickLinkPasswordModal } from '../../../quickActions'
 import DetailsAndEdit from './Links/DetailsAndEdit.vue'
 import NameAndCopy from './Links/NameAndCopy.vue'
-import { useGraphClient } from 'web-pkg/src/composables'
 import CreateQuickLink from './Links/CreateQuickLink.vue'
 import { getLocaleFromLanguage } from 'web-pkg/src/helpers'
 import { Resource } from 'web-client/src/helpers'
@@ -165,7 +164,6 @@ export default defineComponent({
     const canCreatePublicLinks = computed(() => can('create-all', 'PublicLink'))
 
     return {
-      ...useGraphClient(),
       space: inject<Resource>('space'),
       resource: inject<Resource>('resource'),
       incomingParentShare: inject<Resource>('incomingParentShare'),
diff --git a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
index 5c8009073d5..186aa321c0c 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
@@ -70,7 +70,7 @@ import { createLocationSpaces, isLocationSpacesActive } from '../../../router'
 import { defineComponent, inject } from 'vue'
 import { shareSpaceAddMemberHelp } from '../../../helpers/contextualHelpers'
 import { Resource } from 'web-client/src/helpers'
-import { useGraphClient } from 'web-pkg/src/composables'
+import { useClientService } from 'web-pkg/src/composables'
 import Fuse from 'fuse.js'
 import Mark from 'mark.js'
 
@@ -81,8 +81,9 @@ export default defineComponent({
     InviteCollaboratorForm
   },
   setup() {
+    const clientService = useClientService()
     return {
-      ...useGraphClient(),
+      clientService,
       resource: inject<Resource>('resource')
     }
   },
@@ -191,7 +192,7 @@ export default defineComponent({
         const currentUserRemoved = share.collaborator.name === this.user.id
         await this.deleteSpaceMember({
           client: this.$client,
-          graphClient: this.graphClient,
+          graphClient: this.clientService.graphAuthenticated,
           share: share,
           reloadSpace: !currentUserRemoved
         })
diff --git a/packages/web-app-files/src/components/SideBar/SideBar.vue b/packages/web-app-files/src/components/SideBar/SideBar.vue
index b92ae2de966..86440bd0d8c 100644
--- a/packages/web-app-files/src/components/SideBar/SideBar.vue
+++ b/packages/web-app-files/src/components/SideBar/SideBar.vue
@@ -54,7 +54,6 @@ import {
 import {
   useCapabilityShareJailEnabled,
   useClientService,
-  useGraphClient,
   useStore,
   useRouter
 } from 'web-pkg/src/composables'
@@ -83,7 +82,7 @@ export default defineComponent({
     const router = useRouter()
     const { $gettext } = useGettext()
     const { owncloudSdk } = useClientService()
-    const { graphClient } = useGraphClient()
+    const clientService = useClientService()
     const { webdav } = useClientService()
 
     const loadedResource = ref()
@@ -274,7 +273,7 @@ export default defineComponent({
 
           if (unref(highlightedFileIsSpace)) {
             store.dispatch('runtime/spaces/loadSpaceMembers', {
-              graphClient: unref(graphClient),
+              graphClient: clientService.graphAuthenticated,
               space: unref(highlightedSpace)
             })
           }
diff --git a/packages/web-app-files/src/components/SideBar/TagsPanel.vue b/packages/web-app-files/src/components/SideBar/TagsPanel.vue
index b3c8fa89703..5d3b1b5f65a 100644
--- a/packages/web-app-files/src/components/SideBar/TagsPanel.vue
+++ b/packages/web-app-files/src/components/SideBar/TagsPanel.vue
@@ -59,7 +59,7 @@ import { computed, defineComponent, inject, onMounted, ref, unref, watch } from
 import CompareSaveDialog from 'web-pkg/src/components/sideBar/CompareSaveDialog.vue'
 import { eventBus } from 'web-pkg/src/services/eventBus'
 import { useTask } from 'vue-concurrency'
-import { useStore, useGraphClient } from 'web-pkg/src/composables'
+import { useClientService, useStore } from 'web-pkg/src/composables'
 import { Resource } from 'web-client'
 import diff from 'lodash-es/difference'
 import { useGettext } from 'vue3-gettext'
@@ -73,7 +73,7 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
-    const { graphClient } = useGraphClient()
+    const clientService = useClientService()
     const { $gettext } = useGettext()
 
     const injectedResource = inject<Resource>('resource')
@@ -85,7 +85,7 @@ export default defineComponent({
     const loadAvailableTagsTask = useTask(function* () {
       const {
         data: { value: tags = [] }
-      } = yield unref(graphClient).tags.getTags()
+      } = yield clientService.graphAuthenticated.tags.getTags()
       availableTags.value = [...tags]
     })
 
@@ -116,11 +116,17 @@ export default defineComponent({
         const tagsToRemove = diff(tags, selectedTags.value)
 
         if (tagsToAdd.length) {
-          await unref(graphClient).tags.assignTags({ resourceId: fileId, tags: tagsToAdd })
+          await clientService.graphAuthenticated.tags.assignTags({
+            resourceId: fileId,
+            tags: tagsToAdd
+          })
         }
 
         if (tagsToRemove.length) {
-          await unref(graphClient).tags.unassignTags({ resourceId: fileId, tags: tagsToRemove })
+          await clientService.graphAuthenticated.tags.unassignTags({
+            resourceId: fileId,
+            tags: tagsToRemove
+          })
         }
 
         store.commit('Files/UPDATE_RESOURCE_FIELD', {
diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
index 6c645aa916b..984d3fa50b0 100644
--- a/packages/web-app-files/src/views/spaces/Projects.vue
+++ b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -77,7 +77,7 @@ import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
 
 import AppBar from '../../components/AppBar/AppBar.vue'
 import CreateSpace from '../../components/AppBar/CreateSpace.vue'
-import { useAbility, useAccessToken, useStore, useGraphClient } from 'web-pkg/src/composables'
+import { useAbility, useAccessToken, useClientService, useStore } from 'web-pkg/src/composables'
 import { loadPreview } from 'web-pkg/src/helpers/preview'
 import { ImageDimension } from 'web-pkg/src/constants'
 import SpaceContextActions from '../../components/Spaces/SpaceContextActions.vue'
@@ -106,6 +106,7 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
+    const clientService = useClientService()
     const { selectedResourcesIds } = useSelectedResources({ store })
     const { can } = useAbility()
 
@@ -125,7 +126,6 @@ export default defineComponent({
     })
 
     const accessToken = useAccessToken({ store })
-    const { graphClient } = useGraphClient()
 
     const { scrollToResourceFromRoute } = useScrollTo()
 
@@ -133,7 +133,7 @@ export default defineComponent({
       store.commit('Files/CLEAR_FILES_SEARCHED')
       store.commit('Files/CLEAR_CURRENT_FILES_LIST')
       yield store.dispatch('runtime/spaces/reloadProjectSpaces', {
-        graphClient: unref(graphClient)
+        graphClient: clientService.graphAuthenticated
       })
       store.commit('Files/LOAD_FILES', { currentFolder: null, files: unref(spaces) })
     })
@@ -153,7 +153,7 @@ export default defineComponent({
     return {
       ...useSideBar(),
       spaces,
-      graphClient,
+      clientService,
       loadResourcesTask,
       areResourcesLoading,
       accessToken,
@@ -212,9 +212,9 @@ export default defineComponent({
             .slice(webDavPathComponents.indexOf(idComponent) + 1)
             .join('/')
 
-          const resource = await (this.$clientService.webdav as WebDAV).getFileInfo(space, { path })
+          const resource = await (this.clientService.webdav as WebDAV).getFileInfo(space, { path })
           loadPreview({
-            clientService: this.$clientService,
+            clientService: this.clientService,
             resource,
             isPublic: false,
             dimensions: ImageDimension.Tile,
diff --git a/packages/web-app-files/src/views/trash/Overview.vue b/packages/web-app-files/src/views/trash/Overview.vue
index 00b829fad4e..e93a4107760 100644
--- a/packages/web-app-files/src/views/trash/Overview.vue
+++ b/packages/web-app-files/src/views/trash/Overview.vue
@@ -60,7 +60,7 @@ import Mark from 'mark.js'
 import Fuse from 'fuse.js'
 import { useGettext } from 'vue3-gettext'
 import { useTask } from 'vue-concurrency'
-import { useGraphClient, useRouter, useStore } from 'web-pkg'
+import { useClientService, useRouter, useStore } from 'web-pkg'
 import { createLocationTrash } from 'web-app-files/src/router'
 import { createFileRouteOptions } from 'web-pkg/src/helpers/router'
 import AppBar from 'web-app-files/src/components/AppBar/AppBar.vue'
@@ -80,12 +80,12 @@ export default defineComponent({
     const store = useStore()
     const router = useRouter()
     const { $gettext } = useGettext()
+    const clientService = useClientService()
     const sortBy = ref('name')
     const sortDir = ref('asc')
     const filterTerm = ref('')
     const markInstance = ref(undefined)
     const tableRef = ref(undefined)
-    const { graphClient } = useGraphClient()
 
     const spaces = computed(() =>
       store.getters['runtime/spaces/spaces'].filter(
@@ -97,7 +97,7 @@ export default defineComponent({
       store.commit('Files/CLEAR_FILES_SEARCHED')
       store.commit('Files/CLEAR_CURRENT_FILES_LIST')
       yield store.dispatch('runtime/spaces/reloadProjectSpaces', {
-        graphClient: unref(graphClient)
+        graphClient: clientService.graphAuthenticated
       })
       store.commit('Files/LOAD_FILES', { currentFolder: null, files: unref(spaces) })
     })
diff --git a/packages/web-pkg/src/components/Spaces/QuotaModal.vue b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
index 3a937a694a4..1135be2451a 100644
--- a/packages/web-pkg/src/components/Spaces/QuotaModal.vue
+++ b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
@@ -22,13 +22,13 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, unref, PropType } from 'vue'
-import { mapActions, mapMutations } from 'vuex'
+import { computed, defineComponent, unref, PropType, ref, onMounted } from 'vue'
 import { useGettext } from 'vue3-gettext'
-import { useGraphClient } from 'web-pkg/src/composables'
 import QuotaSelect from 'web-pkg/src/components/QuotaSelect.vue'
 import { SpaceResource } from 'web-client/src'
-import { eventBus } from 'web-pkg/src'
+import { eventBus, useClientService, useRouter } from 'web-pkg/src'
+import { useStore } from 'web-pkg/src/composables'
+import { Drive } from 'web-client/src/generated'
 
 export default defineComponent({
   name: 'SpaceQuotaModal',
@@ -59,7 +59,11 @@ export default defineComponent({
   },
   emits: ['spaceQuotaUpdated'],
   setup(props) {
+    const store = useStore()
     const { $gettext, $ngettext } = useGettext()
+    const clientService = useClientService()
+    const router = useRouter()
+    const selectedOption = ref(0)
 
     const modalTitle = computed(() => {
       if (props.resourceType === 'space') {
@@ -123,54 +127,35 @@ export default defineComponent({
       return $gettext('Failed to change quota')
     }
 
-    return {
-      ...useGraphClient(),
-      modalTitle,
-      getSuccessMessage,
-      getErrorMessage
-    }
-  },
-  data: function () {
-    return {
-      selectedOption: 0
-    }
-  },
-  computed: {
-    confirmButtonDisabled() {
-      return !this.spaces.some((space) => space.spaceQuota.total !== this.selectedOption)
+    const confirmButtonDisabled = computed(() => {
+      return !props.spaces.some((space) => space.spaceQuota.total !== unref(selectedOption))
+    })
+
+    const changeSelectedQuotaOption = (option) => {
+      selectedOption.value = option.value
     }
-  },
-  mounted() {
-    this.selectedOption = this.spaces[0]?.spaceQuota?.total || 0
-  },
-  methods: {
-    ...mapActions(['showMessage']),
-    ...mapMutations('Files', ['UPDATE_RESOURCE_FIELD']),
-    ...mapMutations('runtime/spaces', ['UPDATE_SPACE_FIELD']),
 
-    changeSelectedQuotaOption(option) {
-      this.selectedOption = option.value
-    },
-    async editQuota(): Promise<void> {
-      const requests = this.spaces.map(async (space): Promise<void> => {
-        const { data: driveData } = await this.graphClient.drives.updateDrive(
-          space.id,
-          { quota: { total: this.selectedOption } },
+    const editQuota = async (): Promise<void> => {
+      const client = clientService.graphAuthenticated
+      const requests = props.spaces.map(async (space): Promise<void> => {
+        const { data: driveData } = await client.drives.updateDrive(
+          space.id.toString(),
+          { quota: { total: unref(selectedOption) } } as Drive,
           {}
         )
-        this.cancel()
-        if (unref(this.$router.currentRoute).name === 'admin-settings-spaces') {
+        props.cancel()
+        if (unref(router.currentRoute).name === 'admin-settings-spaces') {
           eventBus.publish('app.admin-settings.spaces.space.quota.updated', {
             spaceId: space.id,
             quota: driveData.quota
           })
         }
-        this.UPDATE_SPACE_FIELD({
+        store.commit('runtime/spaces/UPDATE_SPACE_FIELD', {
           id: space.id,
           field: 'spaceQuota',
           value: driveData.quota
         })
-        this.UPDATE_RESOURCE_FIELD({
+        store.commit('Files/UPDATE_RESOURCE_FIELD', {
           id: space.id,
           field: 'spaceQuota',
           value: driveData.quota
@@ -179,14 +164,26 @@ export default defineComponent({
       const results = await Promise.allSettled<Array<unknown>>(requests)
       const succeeded = results.filter((r) => r.status === 'fulfilled')
       if (succeeded.length) {
-        this.showMessage({ title: this.getSuccessMessage(succeeded.length) })
+        return store.dispatch('showMessage', { title: getSuccessMessage(succeeded.length) })
       }
       const errors = results.filter((r) => r.status === 'rejected')
       if (errors.length) {
         errors.forEach(console.error)
-        this.showMessage({ title: this.getErrorMessage(errors.length) })
+        await store.dispatch('showMessage', { title: getErrorMessage(errors.length) })
       }
     }
+
+    onMounted(() => {
+      selectedOption.value = props.spaces[0]?.spaceQuota?.total || 0
+    })
+
+    return {
+      selectedOption,
+      modalTitle,
+      confirmButtonDisabled,
+      changeSelectedQuotaOption,
+      editQuota
+    }
   }
 })
 </script>
diff --git a/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts b/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
index 3b1e7fd4f66..1a74130418f 100644
--- a/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
+++ b/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
@@ -3,13 +3,13 @@ import { Store } from 'vuex'
 import { computed, Ref, ref, unref, watch } from 'vue'
 import { buildShareSpaceResource, SpaceResource } from 'web-client/src/helpers'
 import { useRouteQuery } from '../router'
-import { useGraphClient } from '../graphClient'
 import { Resource } from 'web-client'
 import { useSpacesLoading } from './useSpacesLoading'
 import { queryItemAsString } from '../appDefaults'
 import { configurationManager } from '../../configuration'
 import { urlJoin } from 'web-client/src/utils'
 import { useCapabilitySpacesEnabled } from '../capability'
+import { useClientService } from 'web-pkg/src/composables'
 
 interface DriveResolverOptions {
   store?: Store<any>
@@ -32,7 +32,7 @@ export const useDriveResolver = (options: DriveResolverOptions = {}): DriveResol
   })
   const hasSpaces = useCapabilitySpacesEnabled(store)
 
-  const { graphClient } = useGraphClient()
+  const clientService = useClientService()
   const spaces = computed<SpaceResource[]>(() => store.getters['runtime/spaces/spaces'])
   const space = ref<SpaceResource>(null)
   const item: Ref<string> = ref(null)
@@ -111,7 +111,7 @@ export const useDriveResolver = (options: DriveResolverOptions = {}): DriveResol
         return
       }
       return store.dispatch('runtime/spaces/loadSpaceMembers', {
-        graphClient: unref(graphClient),
+        graphClient: clientService.graphAuthenticated,
         space: s
       })
     },
diff --git a/packages/web-pkg/src/composables/graphClient/index.ts b/packages/web-pkg/src/composables/graphClient/index.ts
deleted file mode 100644
index 2611ce3155a..00000000000
--- a/packages/web-pkg/src/composables/graphClient/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './useGraphClient'
diff --git a/packages/web-pkg/src/composables/graphClient/useGraphClient.ts b/packages/web-pkg/src/composables/graphClient/useGraphClient.ts
deleted file mode 100644
index e359b71611a..00000000000
--- a/packages/web-pkg/src/composables/graphClient/useGraphClient.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { computed } from 'vue'
-import { useClientService } from '../'
-
-export const useGraphClient = () => {
-  const clientService = useClientService()
-
-  const graphClient = computed(() => {
-    return clientService.graphAuthenticated
-  })
-
-  return {
-    graphClient
-  }
-}
diff --git a/packages/web-pkg/src/composables/index.ts b/packages/web-pkg/src/composables/index.ts
index cb152aaa3ce..69e7c81f398 100644
--- a/packages/web-pkg/src/composables/index.ts
+++ b/packages/web-pkg/src/composables/index.ts
@@ -4,7 +4,6 @@ export * from './authContext'
 export * from './capability'
 export * from './clientService'
 export * from './driveResolver'
-export * from './graphClient'
 export * from './loadingService'
 export * from './localStorage'
 export * from './router'
diff --git a/packages/web-pkg/src/mixins/spaces/showMembers.ts b/packages/web-pkg/src/mixins/spaces/showMembers.ts
index 15596f8d2d7..bbdd7c539f3 100644
--- a/packages/web-pkg/src/mixins/spaces/showMembers.ts
+++ b/packages/web-pkg/src/mixins/spaces/showMembers.ts
@@ -1,12 +1,8 @@
 import { mapMutations } from 'vuex'
 import { eventBus } from 'web-pkg/src/services/eventBus'
-import { useGraphClient } from 'web-pkg/src/composables'
 import { SideBarEventTopics } from 'web-pkg/src/composables/sideBar'
 
 export default {
-  setup() {
-    return { ...useGraphClient() }
-  },
   computed: {
     $_showMembers_items() {
       return [
diff --git a/packages/web-pkg/src/services/client/client.ts b/packages/web-pkg/src/services/client/client.ts
index 14006e482e7..0a504fb507e 100644
--- a/packages/web-pkg/src/services/client/client.ts
+++ b/packages/web-pkg/src/services/client/client.ts
@@ -22,7 +22,7 @@ interface HttpClient {
   token?: string
 }
 
-const createAxiosInstance = (authParams: AuthParameters, language): AxiosInstance => {
+const createAxiosInstance = (authParams: AuthParameters, language: string): AxiosInstance => {
   const auth = new Auth(authParams)
   const axiosClient = axios.create({
     headers: auth.getHeaders()
diff --git a/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts b/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
index eb65cc9ab4c..066835e6301 100644
--- a/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
@@ -12,7 +12,7 @@ import {
 describe('QuotaModal', () => {
   describe('method "editQuota"', () => {
     it('should show message on success', async () => {
-      const { wrapper, mocks } = getWrapper()
+      const { wrapper, mocks, storeOptions } = getWrapper()
       mocks.$clientService.graphAuthenticated.drives.updateDrive.mockImplementation(() =>
         mockAxiosResolve({
           id: '1fe58d8b-aa69-4c22-baf7-97dd57479f22',
@@ -25,24 +25,24 @@ describe('QuotaModal', () => {
           }
         })
       )
-      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
-      const updateSpaceFieldStub = jest.spyOn(wrapper.vm, 'UPDATE_SPACE_FIELD')
       await wrapper.vm.editQuota()
 
-      expect(updateSpaceFieldStub).toHaveBeenCalledTimes(1)
-      expect(showMessageStub).toHaveBeenCalledTimes(1)
+      expect(
+        storeOptions.modules.runtime.modules.spaces.mutations.UPDATE_SPACE_FIELD
+      ).toHaveBeenCalledTimes(1)
+      expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
     })
 
     it('should show message on server error', async () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
-      const { wrapper, mocks } = getWrapper()
+      const { wrapper, mocks, storeOptions } = getWrapper()
       mocks.$clientService.graphAuthenticated.drives.updateDrive.mockRejectedValue(new Error())
-      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
-      const updateSpaceFieldStub = jest.spyOn(wrapper.vm, 'UPDATE_SPACE_FIELD')
       await wrapper.vm.editQuota()
 
-      expect(updateSpaceFieldStub).toHaveBeenCalledTimes(0)
-      expect(showMessageStub).toHaveBeenCalledTimes(1)
+      expect(
+        storeOptions.modules.runtime.modules.spaces.mutations.UPDATE_SPACE_FIELD
+      ).toHaveBeenCalledTimes(0)
+      expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
     })
   })
 })
@@ -53,16 +53,8 @@ function getWrapper() {
   const store = createStore(storeOptions)
   return {
     mocks,
+    storeOptions,
     wrapper: mount(QuotaModal, {
-      data: () => {
-        return {
-          selectedOption: {
-            displayValue: '10',
-            displayUnit: 'GB',
-            value: 10 * Math.pow(10, 9)
-          }
-        }
-      },
       props: {
         cancel: jest.fn(),
         spaces: [
diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json
index 74ae19a494a..bcfe1fc6166 100644
--- a/packages/web-runtime/package.json
+++ b/packages/web-runtime/package.json
@@ -27,7 +27,7 @@
     "luxon": "^2.4.0",
     "marked": "^4.0.12",
     "oidc-client-ts": "^2.1.0",
-    "owncloud-sdk": "~3.1.0-alpha.3",
+    "owncloud-sdk": "~3.1.0-alpha.4",
     "p-queue": "^6.6.2",
     "portal-vue": "3.0.0",
     "postcss-import": "^12.0.1",
diff --git a/packages/web-runtime/src/pages/account.vue b/packages/web-runtime/src/pages/account.vue
index 6489510252e..5c1ef5dd319 100644
--- a/packages/web-runtime/src/pages/account.vue
+++ b/packages/web-runtime/src/pages/account.vue
@@ -89,7 +89,7 @@ import { computed, defineComponent, onMounted, unref } from 'vue'
 import {
   useAccessToken,
   useCapabilitySpacesEnabled,
-  useGraphClient,
+  useClientService,
   useStore
 } from 'web-pkg/src/composables'
 import { useTask } from 'vue-concurrency'
@@ -107,6 +107,7 @@ export default defineComponent({
     const store = useStore()
     const accessToken = useAccessToken({ store })
     const language = useGettext()
+    const clientService = useClientService()
 
     // FIXME: Use graph capability when we have it
     const isLanguageSupported = useCapabilitySpacesEnabled()
@@ -207,7 +208,7 @@ export default defineComponent({
     })
 
     return {
-      ...useGraphClient(),
+      clientService,
       languageOptions,
       selectedLanguageOption,
       updateSelectedLanguage,
@@ -237,7 +238,7 @@ export default defineComponent({
       this.editPasswordModalOpen = false
     },
     editPassword(currentPassword, newPassword) {
-      return this.graphClient.users
+      return this.clientService.graphAuthenticated.users
         .changeOwnPassword(currentPassword.trim(), newPassword.trim())
         .then(() => {
           this.closeEditPasswordModal()
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1a42d99572e..aee4bf6567f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -283,7 +283,7 @@ importers:
       '@babel/preset-env': 7.19.4_@babel+core@7.19.6
       '@babel/runtime': 7.20.1
       '@popperjs/core': 2.11.5
-      autoprefixer: 10.4.12_postcss@8.4.20
+      autoprefixer: 10.4.12_postcss@8.4.21
       babel-core: 7.0.0-bridge.0_@babel+core@7.19.6
       babel-jest: 29.2.2_@babel+core@7.19.6
       babel-loader: 9.1.0_q4ydpsrmbqywduja5orgah6fgq
@@ -331,7 +331,7 @@ importers:
       style-loader: 2.0.0_webpack@4.46.0
       style-value-types: 5.1.2
       stylelint: 14.16.0
-      stylelint-config-sass-guidelines: 9.0.1_l3s4qeu3gkar2knsdy3w5miimm
+      stylelint-config-sass-guidelines: 9.0.1_4hlw5ipnhspjrftdr7hqo6kmye
       stylelint-config-standard: 26.0.0_stylelint@14.16.0
       tinycolor2: 1.4.2
       tippy.js: 6.3.7
@@ -647,7 +647,7 @@ importers:
       luxon: ^2.4.0
       marked: ^4.0.12
       oidc-client-ts: ^2.1.0
-      owncloud-sdk: ~3.1.0-alpha.3
+      owncloud-sdk: ~3.1.0-alpha.4
       p-queue: ^6.6.2
       portal-vue: 3.0.0
       postcss-import: ^12.0.1
@@ -695,7 +695,7 @@ importers:
       luxon: 2.4.0
       marked: 4.0.12
       oidc-client-ts: 2.1.0
-      owncloud-sdk: 3.1.0-alpha.3_qgpf6seimtkgc6dfu7oqfstxh4
+      owncloud-sdk: 3.1.0-alpha.4_qgpf6seimtkgc6dfu7oqfstxh4
       p-queue: 6.6.2
       portal-vue: 3.0.0_vue@3.2.47
       postcss-import: 12.0.1
@@ -7426,7 +7426,7 @@ packages:
     engines: {node: '>=8.0.0'}
     dev: true
 
-  /autoprefixer/10.4.12_postcss@8.4.20:
+  /autoprefixer/10.4.12_postcss@8.4.21:
     resolution: {integrity: sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==}
     engines: {node: ^10 || ^12 || >=14}
     hasBin: true
@@ -7438,7 +7438,7 @@ packages:
       fraction.js: 4.2.0
       normalize-range: 0.1.2
       picocolors: 1.0.0
-      postcss: 8.4.20
+      postcss: 8.4.21
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -16561,8 +16561,8 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /owncloud-sdk/3.1.0-alpha.3_qgpf6seimtkgc6dfu7oqfstxh4:
-    resolution: {integrity: sha512-jouNHVHUJBuYs7A1ZPUNl+uSUulSYwTFzOjW4NhONl9xbDthKDeB+vWycUY9IdFRKroF8l1qo4xkXVO9mn7U/A==}
+  /owncloud-sdk/3.1.0-alpha.4_qgpf6seimtkgc6dfu7oqfstxh4:
+    resolution: {integrity: sha512-Z+ZKPhccB+BrPKqT5Lv8jwTl3zBtw8POgytPi5jByNQpPoU1JuQ9H32ysHa3yFU/rhIuYWWDBSHPlvw+nyIUlA==}
     peerDependencies:
       axios: ^0.27.2
       cross-fetch: ^3.0.6
@@ -17456,13 +17456,13 @@ packages:
       postcss: 8.4.20
     dev: true
 
-  /postcss-scss/4.0.6_postcss@8.4.20:
+  /postcss-scss/4.0.6_postcss@8.4.21:
     resolution: {integrity: sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==}
     engines: {node: '>=12.0'}
     peerDependencies:
       postcss: ^8.4.19
     dependencies:
-      postcss: 8.4.20
+      postcss: 8.4.21
     dev: true
 
   /postcss-selector-parser/6.0.10:
@@ -17558,7 +17558,6 @@ packages:
       nanoid: 3.3.4
       picocolors: 1.0.0
       source-map-js: 1.0.2
-    dev: false
 
   /preact/10.7.1:
     resolution: {integrity: sha512-MufnRFz39aIhs9AMFisonjzTud1PK1bY+jcJLo6m2T9Uh8AqjD77w11eAAawmjUogoGOnipECq7e/1RClIKsxg==}
@@ -19909,15 +19908,15 @@ packages:
       stylelint: 14.16.0
     dev: true
 
-  /stylelint-config-sass-guidelines/9.0.1_l3s4qeu3gkar2knsdy3w5miimm:
+  /stylelint-config-sass-guidelines/9.0.1_4hlw5ipnhspjrftdr7hqo6kmye:
     resolution: {integrity: sha512-N06PsVsrgKijQ3YT5hqKA7x3NUkgELTRI1cbWMqcYiCGG6MjzvNk6Cb5YYA1PrvrksBV76BvY9P9bAswojVMqA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       postcss: ^8.3.3
       stylelint: ^14.0.1
     dependencies:
-      postcss: 8.4.20
-      postcss-scss: 4.0.6_postcss@8.4.20
+      postcss: 8.4.21
+      postcss-scss: 4.0.6_postcss@8.4.21
       stylelint: 14.16.0
       stylelint-order: 5.0.0_stylelint@14.16.0
       stylelint-scss: 4.3.0_stylelint@14.16.0