diff --git a/apps/api/src/app/access/access.controller.ts b/apps/api/src/app/access/access.controller.ts
index 06ebc41d5..791ea7d26 100644
--- a/apps/api/src/app/access/access.controller.ts
+++ b/apps/api/src/app/access/access.controller.ts
@@ -35,48 +35,6 @@ export class AccessController {
     @Inject(REQUEST) private readonly request: RequestWithUser
   ) {}
 
-  @Get()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
-  public async getAllAccesses(): Promise<Access[]> {
-    const accessesWithGranteeUser = await this.accessService.accesses({
-      include: {
-        granteeUser: true
-      },
-      orderBy: [{ granteeUserId: 'desc' }, { createdAt: 'asc' }],
-      where: { userId: this.request.user.id }
-    });
-
-    return accessesWithGranteeUser.map(
-      ({
-        alias,
-        granteeUser,
-        id,
-        permissions: accessPermissions,
-        settings
-      }) => {
-        if (granteeUser) {
-          return {
-            alias,
-            id,
-            permissions: accessPermissions,
-            settings: settings as AccessSettings,
-            grantee: granteeUser?.id,
-            type: 'PRIVATE'
-          };
-        }
-
-        return {
-          alias,
-          id,
-          permissions: accessPermissions,
-          settings: settings as AccessSettings,
-          grantee: 'Public',
-          type: 'PUBLIC'
-        };
-      }
-    );
-  }
-
   @HasPermission(permissions.createAccess)
   @Post()
   @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
@@ -136,6 +94,48 @@ export class AccessController {
     });
   }
 
+  @Get()
+  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  public async getAllAccesses(): Promise<Access[]> {
+    const accessesWithGranteeUser = await this.accessService.accesses({
+      include: {
+        granteeUser: true
+      },
+      orderBy: [{ granteeUserId: 'desc' }, { createdAt: 'asc' }],
+      where: { userId: this.request.user.id }
+    });
+
+    return accessesWithGranteeUser.map(
+      ({
+        alias,
+        granteeUser,
+        id,
+        permissions: accessPermissions,
+        settings
+      }) => {
+        if (granteeUser) {
+          return {
+            alias,
+            id,
+            permissions: accessPermissions,
+            settings: settings as AccessSettings,
+            grantee: granteeUser?.id,
+            type: 'PRIVATE'
+          };
+        }
+
+        return {
+          alias,
+          id,
+          permissions: accessPermissions,
+          settings: settings as AccessSettings,
+          grantee: 'Public',
+          type: 'PUBLIC'
+        };
+      }
+    );
+  }
+
   @HasPermission(permissions.updateAccess)
   @Put(':id')
   @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
diff --git a/apps/api/src/app/endpoints/public/public.controller.ts b/apps/api/src/app/endpoints/public/public.controller.ts
index 2dd5e5f98..8a59ffc3a 100644
--- a/apps/api/src/app/endpoints/public/public.controller.ts
+++ b/apps/api/src/app/endpoints/public/public.controller.ts
@@ -244,12 +244,12 @@ export class PublicController {
     });
 
     const publicPortfolioResponse: PublicPortfolioResponse = {
+      alias: access.alias,
       createdAt,
       hasDetails,
       latestActivities,
-      markets,
-      alias: access.alias,
       holdings: {},
+      markets,
       performance: {
         '1d': {
           relativeChange:
diff --git a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts
index 093d7f596..ce754bffb 100644
--- a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts
+++ b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts
@@ -69,9 +69,9 @@ export class GfCreateOrUpdateAccessDialogComponent
   private unsubscribeSubject = new Subject<void>();
 
   public constructor(
+    public dialogRef: MatDialogRef<GfCreateOrUpdateAccessDialogComponent>,
     private changeDetectorRef: ChangeDetectorRef,
     @Inject(MAT_DIALOG_DATA) private data: CreateOrUpdateAccessDialogParams,
-    public dialogRef: MatDialogRef<GfCreateOrUpdateAccessDialogComponent>,
     private dataService: DataService,
     private formBuilder: FormBuilder,
     private notificationService: NotificationService