diff --git a/apps/console/src/layouts/MainLayout.tsx b/apps/console/src/layouts/MainLayout.tsx
index ce4dc3d6c..ebca8c065 100644
--- a/apps/console/src/layouts/MainLayout.tsx
+++ b/apps/console/src/layouts/MainLayout.tsx
@@ -46,8 +46,9 @@ import { Link, Navigate, Outlet, useParams } from "react-router";
 import { graphql } from "relay-runtime";
 import type { MainLayoutQuery as MainLayoutQueryType } from "./__generated__/MainLayoutQuery.graphql";
 import { PageError } from "/components/PageError";
-import { PermissionsContext, PermissionsProvider } from "/providers/PermissionsProvider";
+import { PermissionsProvider } from "/providers/PermissionsProvider";
 import { buildEndpoint } from "/providers/RelayProviders";
+import { PermissionsContext } from "/providers/PermissionsContext";
 
 const MainLayoutQuery = graphql`
   query MainLayoutQuery($organizationId: ID!) {
diff --git a/apps/console/src/pages/organizations/documents/DocumentsPage.tsx b/apps/console/src/pages/organizations/documents/DocumentsPage.tsx
index 09e9e8fb5..19ce5533e 100644
--- a/apps/console/src/pages/organizations/documents/DocumentsPage.tsx
+++ b/apps/console/src/pages/organizations/documents/DocumentsPage.tsx
@@ -57,7 +57,7 @@ import {
   type BulkExportDialogRef,
 } from "/components/documents/BulkExportDialog";
 import type { DocumentsPageUserEmailQuery } from "./__generated__/DocumentsPageUserEmailQuery.graphql";
-import { PermissionsContext } from "/providers/PermissionsProvider.tsx";
+import { PermissionsContext } from "/providers/PermissionsContext";
 
 const documentsFragment = graphql`
   fragment DocumentsPageListFragment on Organization
diff --git a/apps/console/src/pages/organizations/processingActivities/ProcessingActivityDetailsPage.tsx b/apps/console/src/pages/organizations/processingActivities/ProcessingActivityDetailsPage.tsx
index 97758c0f7..1fca62fa2 100644
--- a/apps/console/src/pages/organizations/processingActivities/ProcessingActivityDetailsPage.tsx
+++ b/apps/console/src/pages/organizations/processingActivities/ProcessingActivityDetailsPage.tsx
@@ -412,7 +412,7 @@ export default function ProcessingActivityDetailsPage(props: Props) {
 
             {!isSnapshotMode && (
               <div className="flex justify-end pt-4">
-                <Authorized entity="ProcessingActivity" action="updateProcessingActivity">
+                {isAuthorized("ProcessingActivity", "updateProcessingActivity") && (
                   <Button
                     type="submit"
                     variant="primary"
@@ -420,7 +420,7 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                   >
                     {formState.isSubmitting ? __("Saving...") : __("Save Changes")}
                   </Button>
-                </Authorized>
+                )}
               </div>
             )}
           </form>
diff --git a/apps/console/src/pages/organizations/trustCenter/TrustCenterAccessTab.tsx b/apps/console/src/pages/organizations/trustCenter/TrustCenterAccessTab.tsx
index da2443571..158e63886 100644
--- a/apps/console/src/pages/organizations/trustCenter/TrustCenterAccessTab.tsx
+++ b/apps/console/src/pages/organizations/trustCenter/TrustCenterAccessTab.tsx
@@ -423,14 +423,14 @@ export default function TrustCenterAccessTab() {
           </p>
         </div>
         {organization.trustCenter?.id && (
-          {isAuthorized("TrustCenter", "createTrustCenterAccess") && (
+          isAuthorized("TrustCenter", "createTrustCenterAccess") && (
             <Button icon={IconPlusLarge} onClick={() => {
               inviteForm.reset();
               dialogRef.current?.open();
             }}>
               {__("Add Access")}
             </Button>
-          )}
+          )
         )}
       </div>
 
diff --git a/packages/helpers/src/roles.ts b/packages/helpers/src/roles.ts
index 72a0d7abb..95a5aab2b 100644
--- a/packages/helpers/src/roles.ts
+++ b/packages/helpers/src/roles.ts
@@ -1,18 +1,18 @@
-export enum Role {
-  OWNER = "OWNER",
-  ADMIN = "ADMIN",
-  VIEWER = "VIEWER",
-}
+export const Role = {
+  OWNER: "OWNER",
+  ADMIN: "ADMIN",
+  VIEWER: "VIEWER",
+} as const
 
-export function getAssignableRoles(currentRole: Role): string[] {
-  if (!currentRole) return [];
+export type Role = (typeof Role)[keyof typeof Role];
 
-  if (currentRole === "OWNER") {
-    return ["OWNER", "ADMIN", "VIEWER"];
+export function getAssignableRoles(currentRole: Role): Role[] {
+  if (currentRole === Role.OWNER) {
+    return [Role.OWNER, Role.ADMIN, Role.VIEWER];
   }
 
-  if (currentRole === "ADMIN") {
-    return ["ADMIN", "VIEWER"];
+  if (currentRole === Role.ADMIN) {
+    return [Role.ADMIN, Role.VIEWER];
   }
 
   return [];