diff --git a/packages/nc-gui/composables/useMcpSettings.ts b/packages/nc-gui/composables/useMcpSettings.ts
index 5a14804c88..f604c40e2c 100644
--- a/packages/nc-gui/composables/useMcpSettings.ts
+++ b/packages/nc-gui/composables/useMcpSettings.ts
@@ -170,7 +170,7 @@ export const useMcpSettings = createSharedComposable(() => {
   }
 
   const addNewMcpToken = () => {
-    newMcpTokenTitle.value = `MCP - ${user.value?.display_name} - ${dayjs().format('D MMMM YYYY, h:mm A')}`
+    newMcpTokenTitle.value = `MCP - ${user.value?.display_name ?? user.value?.email?.split('@')?.[0]} - ${dayjs().format('D MMMM YYYY, h:mm A')}`
     mcpTokens.value = [
       {
         title: newMcpTokenTitle.value,
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index f7d388980c..698bf1ca09 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -806,6 +806,8 @@
     "reactivateToPlan": "Reactivate {plan} plan?"
   },
   "labels": {
+    "creatingMCPToken": "Creating MCP Token",
+    "creatingTokenDescription": "Creating token for MCP server",
     "mcpToken": "MCP Token",
     "never": "Never",
     "expiresAt": "Expires At",