diff --git a/apps/client/public/locales/en-US/translation.json b/apps/client/public/locales/en-US/translation.json
index 08f83bb8..c61b7d9b 100644
--- a/apps/client/public/locales/en-US/translation.json
+++ b/apps/client/public/locales/en-US/translation.json
@@ -608,21 +608,16 @@
   "Image exceeds 10MB limit.": "Image exceeds 10MB limit.",
   "Image removed successfully": "Image removed successfully",
   "API key": "API key",
-  "API key created successfully": "API key created successfully",
   "API keys": "API keys",
   "API management": "API management",
-  "Are you sure you want to revoke this API key": "Are you sure you want to revoke this API key",
-  "Create API Key": "Create API Key",
   "Custom expiration date": "Custom expiration date",
   "Enter a descriptive token name": "Enter a descriptive token name",
   "Expiration": "Expiration",
   "Expired": "Expired",
   "Expires": "Expires",
-  "I've saved my API key": "I've saved my API key",
   "Last use": "Last Used",
   "No API keys found": "No API keys found",
   "No expiration": "No expiration",
-  "Revoke API key": "Revoke API key",
   "Revoked successfully": "Revoked successfully",
   "Select expiration date": "Select expiration date",
   "This action cannot be undone. Any applications using this API key will stop working.": "This action cannot be undone. Any applications using this API key will stop working.",
@@ -881,25 +876,25 @@
   "Try again": "Try again",
   "Untitled chat": "Untitled chat",
   "What can I help you with?": "What can I help you with?",
-  "Are you sure you want to revoke this SCIM token": "Are you sure you want to revoke this SCIM token",
+  "Are you sure you want to revoke this {{credential}}": "Are you sure you want to revoke this {{credential}}",
   "Automatically provision users and groups from your identity provider via SCIM.": "Automatically provision users and groups from your identity provider via SCIM.",
   "Configure your identity provider with this URL to provision users and groups.": "Configure your identity provider with this URL to provision users and groups.",
-  "Create SCIM token": "Create SCIM token",
+  "Create {{credential}}": "Create {{credential}}",
+  "{{credential}} created": "{{credential}} created",
+  "{{credential}} created successfully": "{{credential}} created successfully",
   "Created by": "Created by",
   "Custom": "Custom",
   "Enable SCIM": "Enable SCIM",
   "Enter a descriptive name": "Enter a descriptive name",
-  "I've saved my SCIM token": "I've saved my SCIM token",
+  "I've saved my {{credential}}": "I've saved my {{credential}}",
   "Important": "Important",
-  "Make sure to copy your SCIM token now. You won't be able to see it again!": "Make sure to copy your SCIM token now. You won't be able to see it again!",
+  "Make sure to copy your {{credential}} now. You won't be able to see it again!": "Make sure to copy your {{credential}} now. You won't be able to see it again!",
   "Never": "Never",
-  "Revoke SCIM token": "Revoke SCIM token",
+  "Revoke {{credential}}": "Revoke {{credential}}",
   "SCIM endpoint URL": "SCIM endpoint URL",
   "SCIM provisioning": "SCIM provisioning",
   "SCIM takes precedence over SSO group sync while enabled.": "SCIM takes precedence over SSO group sync while enabled.",
   "SCIM token": "SCIM token",
-  "SCIM token created": "SCIM token created",
-  "SCIM token created successfully": "SCIM token created successfully",
   "SCIM tokens": "SCIM tokens",
   "This action cannot be undone. Your identity provider will stop syncing immediately.": "This action cannot be undone. Your identity provider will stop syncing immediately.",
   "Toggle SCIM provisioning": "Toggle SCIM provisioning",
diff --git a/apps/client/src/ee/api-key/components/api-key-created-modal.tsx b/apps/client/src/ee/api-key/components/api-key-created-modal.tsx
index 6a01ee3c..ed44811a 100644
--- a/apps/client/src/ee/api-key/components/api-key-created-modal.tsx
+++ b/apps/client/src/ee/api-key/components/api-key-created-modal.tsx
@@ -31,7 +31,7 @@ export function ApiKeyCreatedModal({
     <Modal
       opened={opened}
       onClose={onClose}
-      title={t("API key created")}
+      title={t("{{credential}} created", { credential: t("API key") })}
       size="lg"
     >
       <Stack gap="md">
@@ -41,7 +41,8 @@ export function ApiKeyCreatedModal({
           color="red"
         >
           {t(
-            "Make sure to copy your API key now. You won't be able to see it again!",
+            "Make sure to copy your {{credential}} now. You won't be able to see it again!",
+            { credential: t("API key") },
           )}
         </Alert>
 
@@ -64,7 +65,7 @@ export function ApiKeyCreatedModal({
         </div>
 
         <Button fullWidth onClick={onClose} mt="md">
-          {t("I've saved my API key")}
+          {t("I've saved my {{credential}}", { credential: t("API key") })}
         </Button>
       </Stack>
     </Modal>
diff --git a/apps/client/src/ee/api-key/components/create-api-key-modal.tsx b/apps/client/src/ee/api-key/components/create-api-key-modal.tsx
index ab19552c..0b93c080 100644
--- a/apps/client/src/ee/api-key/components/create-api-key-modal.tsx
+++ b/apps/client/src/ee/api-key/components/create-api-key-modal.tsx
@@ -105,7 +105,7 @@ export function CreateApiKeyModal({
     <Modal
       opened={opened}
       onClose={handleClose}
-      title={t("Create API Key")}
+      title={t("Create {{credential}}", { credential: t("API key") })}
       size="md"
     >
       <form onSubmit={form.onSubmit((values) => handleSubmit(values))}>
diff --git a/apps/client/src/ee/api-key/components/revoke-api-key-modal.tsx b/apps/client/src/ee/api-key/components/revoke-api-key-modal.tsx
index 3092ead4..95651a4e 100644
--- a/apps/client/src/ee/api-key/components/revoke-api-key-modal.tsx
+++ b/apps/client/src/ee/api-key/components/revoke-api-key-modal.tsx
@@ -30,12 +30,14 @@ export function RevokeApiKeyModal({
     <Modal
       opened={opened}
       onClose={onClose}
-      title={t("Revoke API key")}
+      title={t("Revoke {{credential}}", { credential: t("API key") })}
       size="md"
     >
       <Stack gap="md">
         <Text>
-          {t("Are you sure you want to revoke this API key")}{" "}
+          {t("Are you sure you want to revoke this {{credential}}", {
+            credential: t("API key"),
+          })}{" "}
           <strong>{apiKey?.name}</strong>?
         </Text>
         <Text size="sm" c="dimmed">
diff --git a/apps/client/src/ee/api-key/queries/api-key-query.ts b/apps/client/src/ee/api-key/queries/api-key-query.ts
index 75f2d351..f27492da 100644
--- a/apps/client/src/ee/api-key/queries/api-key-query.ts
+++ b/apps/client/src/ee/api-key/queries/api-key-query.ts
@@ -63,7 +63,11 @@ export function useCreateApiKeyMutation() {
   return useMutation<IApiKey, Error, ICreateApiKeyRequest>({
     mutationFn: (data) => createApiKey(data),
     onSuccess: () => {
-      notifications.show({ message: t("API key created successfully") });
+      notifications.show({
+        message: t("{{credential}} created successfully", {
+          credential: t("API key"),
+        }),
+      });
       queryClient.invalidateQueries({
         predicate: (item) =>
           ["api-key-list"].includes(item.queryKey[0] as string),
diff --git a/apps/client/src/ee/scim/components/create-scim-token-modal.tsx b/apps/client/src/ee/scim/components/create-scim-token-modal.tsx
index 9a1a8976..c0dfa35c 100644
--- a/apps/client/src/ee/scim/components/create-scim-token-modal.tsx
+++ b/apps/client/src/ee/scim/components/create-scim-token-modal.tsx
@@ -50,7 +50,7 @@ export function CreateScimTokenModal({
     <Modal
       opened={opened}
       onClose={handleClose}
-      title={t("Create SCIM token")}
+      title={t("Create {{credential}}", { credential: t("SCIM token") })}
       size="md"
     >
       <form onSubmit={form.onSubmit((values) => handleSubmit(values))}>
diff --git a/apps/client/src/ee/scim/components/revoke-scim-token-modal.tsx b/apps/client/src/ee/scim/components/revoke-scim-token-modal.tsx
index 9755614b..c6987845 100644
--- a/apps/client/src/ee/scim/components/revoke-scim-token-modal.tsx
+++ b/apps/client/src/ee/scim/components/revoke-scim-token-modal.tsx
@@ -27,12 +27,14 @@ export function RevokeScimTokenModal({
     <Modal
       opened={opened}
       onClose={onClose}
-      title={t("Revoke SCIM token")}
+      title={t("Revoke {{credential}}", { credential: t("SCIM token") })}
       size="md"
     >
       <Stack gap="md">
         <Text>
-          {t("Are you sure you want to revoke this SCIM token")}{" "}
+          {t("Are you sure you want to revoke this {{credential}}", {
+            credential: t("SCIM token"),
+          })}{" "}
           <strong>{scimToken?.name}</strong>?
         </Text>
         <Text size="sm" c="dimmed">
diff --git a/apps/client/src/ee/scim/components/scim-token-created-modal.tsx b/apps/client/src/ee/scim/components/scim-token-created-modal.tsx
index 681a5e6f..591a30e3 100644
--- a/apps/client/src/ee/scim/components/scim-token-created-modal.tsx
+++ b/apps/client/src/ee/scim/components/scim-token-created-modal.tsx
@@ -27,7 +27,12 @@ export function ScimTokenCreatedModal({
   if (!scimToken) return null;
 
   return (
-    <Modal opened={opened} onClose={onClose} title={t("SCIM token created")} size="lg">
+    <Modal
+      opened={opened}
+      onClose={onClose}
+      title={t("{{credential}} created", { credential: t("SCIM token") })}
+      size="lg"
+    >
       <Stack gap="md">
         <Alert
           icon={<IconAlertTriangle size={16} />}
@@ -35,7 +40,8 @@ export function ScimTokenCreatedModal({
           color="red"
         >
           {t(
-            "Make sure to copy your SCIM token now. You won't be able to see it again!",
+            "Make sure to copy your {{credential}} now. You won't be able to see it again!",
+            { credential: t("SCIM token") },
           )}
         </Alert>
 
@@ -55,7 +61,7 @@ export function ScimTokenCreatedModal({
         </div>
 
         <Button fullWidth onClick={onClose} mt="md">
-          {t("I've saved my SCIM token")}
+          {t("I've saved my {{credential}}", { credential: t("SCIM token") })}
         </Button>
       </Stack>
     </Modal>
diff --git a/apps/client/src/ee/scim/queries/scim-token-query.ts b/apps/client/src/ee/scim/queries/scim-token-query.ts
index 06ab0912..783443dc 100644
--- a/apps/client/src/ee/scim/queries/scim-token-query.ts
+++ b/apps/client/src/ee/scim/queries/scim-token-query.ts
@@ -38,7 +38,11 @@ export function useCreateScimTokenMutation() {
   return useMutation<IScimToken, Error, ICreateScimTokenRequest>({
     mutationFn: (data) => createScimToken(data),
     onSuccess: () => {
-      notifications.show({ message: t("SCIM token created successfully") });
+      notifications.show({
+        message: t("{{credential}} created successfully", {
+          credential: t("SCIM token"),
+        }),
+      });
       queryClient.invalidateQueries({
         predicate: (item) =>
           ["scim-token-list"].includes(item.queryKey[0] as string),
diff --git a/apps/client/src/ee/security/pages/security.tsx b/apps/client/src/ee/security/pages/security.tsx
index 1a0baf94..a922a448 100644
--- a/apps/client/src/ee/security/pages/security.tsx
+++ b/apps/client/src/ee/security/pages/security.tsx
@@ -119,7 +119,9 @@ export default function Security() {
               <Group justify="space-between" mb="md">
                 <Title order={5}>{t("SCIM tokens")}</Title>
                 <Button onClick={() => setCreateOpen(true)}>
-                  {t("Create SCIM token")}
+                  {t("Create {{credential}}", {
+                    credential: t("SCIM token"),
+                  })}
                 </Button>
               </Group>