diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index ff6eea19f..129721d3c 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -105,8 +105,14 @@ export class UserService {
     locale?: string;
     user: UserWithSettings;
   }): Promise<IUser> {
-    const { id, permissions, provider, settings, subscription, thirdPartyId } =
-      user;
+    const {
+      id,
+      permissions: userPermissions,
+      provider,
+      settings,
+      subscription,
+      thirdPartyId
+    } = user;
 
     const userData = await Promise.all([
       this.prismaService.access.findMany({
@@ -165,7 +171,7 @@ export class UserService {
     return {
       activitiesCount,
       id,
-      permissions,
+      permissions: userPermissions,
       provider,
       subscription,
       systemMessage,
diff --git a/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts b/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
index ed99a96b9..17d2dd884 100644
--- a/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
+++ b/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
@@ -181,7 +181,7 @@ export class GfUserAccountSettingsComponent implements OnInit {
 
     // Handle query params for link results
     this.activatedRoute.queryParams
-      .pipe(takeUntil(this.unsubscribeSubject))
+      .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe((params) => {
         if (params['linkSuccess'] === 'true') {
           this.snackBar.open(