diff --git a/apps/client/src/app/components/access-table/access-table.component.html b/apps/client/src/app/components/access-table/access-table.component.html
index 528fd336b1..fd7464f5d1 100644
--- a/apps/client/src/app/components/access-table/access-table.component.html
+++ b/apps/client/src/app/components/access-table/access-table.component.html
@@ -98,10 +98,10 @@
             </button>
           }
           @if (element.type === 'MCP' && hasPermissionToEnableMcp) {
-            <button mat-menu-item (click)="onCopyIdToClipboard(element.id)">
+            <button mat-menu-item (click)="onCopyTokenToClipboard(element.id)">
               <span class="align-items-center d-flex">
                 <ion-icon class="mr-2" name="copy-outline" />
-                <span i18n>Copy identifier to clipboard</span>
+                <span i18n>Copy token to clipboard</span>
               </span>
             </button>
           }
diff --git a/apps/client/src/app/components/access-table/access-table.component.ts b/apps/client/src/app/components/access-table/access-table.component.ts
index 0064df4c41..0ab6f548bd 100644
--- a/apps/client/src/app/components/access-table/access-table.component.ts
+++ b/apps/client/src/app/components/access-table/access-table.component.ts
@@ -139,11 +139,11 @@ export class GfAccessTableComponent {
     return `${this.baseUrl}/${languageCode}/${publicRoutes.public.path}/${aId}`;
   }
 
-  protected onCopyIdToClipboard(aId: string) {
+  protected onCopyTokenToClipboard(aId: string) {
     this.clipboard.copy(aId);
 
     this.snackBar.open(
-      '✅ ' + $localize`Identifier has been copied to the clipboard`,
+      '✅ ' + $localize`Token has been copied to the clipboard`,
       undefined,
       {
         duration: ms('3 seconds')
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 ff88f6f1ed..2fd7cac2d8 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
@@ -236,6 +236,10 @@ export class GfCreateOrUpdateAccessDialogComponent implements OnInit {
     return this.accessForm?.get('type')?.value as AccessType;
   }
 
+  protected get isMcpAccess() {
+    return this.accessType === 'MCP';
+  }
+
   protected get isPublicAccess() {
     return this.accessType === 'PUBLIC';
   }
@@ -245,7 +249,7 @@ export class GfCreateOrUpdateAccessDialogComponent implements OnInit {
   }
 
   protected get showMcpDetails() {
-    return this.canGrantMcpAccess && this.mode === 'update';
+    return this.canGrantMcpAccess && this.isMcpAccess && this.mode === 'update';
   }
 
   protected get showPublicDetails() {