diff --git a/apps/frontend/src/components/ui/auth/PasskeySettings.vue b/apps/frontend/src/components/ui/auth/PasskeySettings.vue
index 2120aad87a..6660a5bba7 100644
--- a/apps/frontend/src/components/ui/auth/PasskeySettings.vue
+++ b/apps/frontend/src/components/ui/auth/PasskeySettings.vue
@@ -6,7 +6,7 @@
 			:description="
 				formatMessage(messages.removePasskeyConfirmDescription, { name: passkeyToRemove?.name })
 			"
-			:proceed-label="formatMessage(commonMessages.removeButton)"
+			:proceed-label="formatMessage(messages.deletePasskeyButton)"
 			@proceed="removePasskey()"
 		/>
 
@@ -70,7 +70,7 @@
 							</ButtonStyled>
 							<ButtonStyled circular>
 								<button
-									v-tooltip="formatMessage(commonMessages.removeButton)"
+									v-tooltip="formatMessage(messages.deletePasskeyButton)"
 									@click="
 										() => {
 											passkeyToRemove = passkey
@@ -88,7 +88,7 @@
 					<ButtonStyled>
 						<button @click="registerPasskey()">
 							<PlusIcon />
-							{{ formatMessage(messages.managePasskeyAddPasskey) }}
+							{{ formatMessage(messages.managePasskeyAddPasskeyButton) }}
 						</button>
 					</ButtonStyled>
 					<ButtonStyled>
@@ -104,7 +104,7 @@
 		<NewModal
 			ref="addPasskeyModal"
 			width="500px"
-			:header="formatMessage(messages.managePasskeyAddPasskey)"
+			:header="formatMessage(messages.passkeyAddModalTitle)"
 		>
 			<div class="flex flex-col gap-6">
 				<div class="flex flex-col gap-2.5">
@@ -133,7 +133,7 @@
 					<ButtonStyled color="brand">
 						<button :disabled="!pendingPasskeyName" @click="finishRegisterPasskey()">
 							<PlusIcon />
-							{{ formatMessage(messages.managePasskeyAddPasskey) }}
+							{{ formatMessage(messages.managePasskeyAddPasskeyButton) }}
 						</button>
 					</ButtonStyled>
 				</div>
@@ -189,7 +189,7 @@
 			<div>
 				<ButtonStyled>
 					<button id="manage-passkeys" @click="showPasskeyModal">
-						<UserKeyIcon /> {{ formatMessage(messages.managePasskeyTitle) }}
+						<UserKeyIcon /> {{ formatMessage(messages.managePasskeyButton) }}
 					</button>
 				</ButtonStyled>
 			</div>
@@ -247,12 +247,16 @@ const messages = defineMessages({
 		id: 'settings.account.security.passkey.title',
 		defaultMessage: 'Manage passkeys',
 	},
+	managePasskeyButton: {
+		id: 'settings.account.security.passkey.button',
+		defaultMessage: 'Manage passkeys',
+	},
 	managePasskeyDescription: {
 		id: 'settings.account.security.passkey.description',
 		defaultMessage: 'Manage your registered passkeys, or add a new one.',
 	},
-	managePasskeyAddPasskey: {
-		id: 'settings.account.security.passkey.add',
+	managePasskeyAddPasskeyButton: {
+		id: 'settings.account.security.passkey.add.button',
 		defaultMessage: 'Add passkey',
 	},
 	managePasskeyModalLoading: {
@@ -275,6 +279,10 @@ const messages = defineMessages({
 		id: 'settings.account.security.passkey.modal.never-used',
 		defaultMessage: 'Never used',
 	},
+	passkeyAddModalTitle: {
+		id: 'settings.account.security.passkey.add-modal.title',
+		defaultMessage: 'Add passkey',
+	},
 	passkeyNameLabel: {
 		id: 'settings.account.security.passkey.add-modal.name.label',
 		defaultMessage: 'Name',
@@ -292,6 +300,10 @@ const messages = defineMessages({
 		id: 'settings.account.security.passkey.rename-modal.header',
 		defaultMessage: 'Rename passkey',
 	},
+	deletePasskeyButton: {
+		id: 'settings.account.security.passkey.remove.button',
+		defaultMessage: 'Delete passkey',
+	},
 	removePasskeyConfirmTitle: {
 		id: 'settings.account.security.passkey.remove.title',
 		defaultMessage: 'Are you sure you want to remove this passkey?',
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 4b4dd86dac..e834846301 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -4100,9 +4100,6 @@
   "settings.account.security.email.title": {
     "message": "Email"
   },
-  "settings.account.security.passkey.add": {
-    "message": "Add passkey"
-  },
   "settings.account.security.passkey.add-modal.name.description": {
     "message": "Make sure to pick something memorable, so you can identify this passkey later."
   },
@@ -4112,6 +4109,15 @@
   "settings.account.security.passkey.add-modal.name.placeholder": {
     "message": "My passkey"
   },
+  "settings.account.security.passkey.add-modal.title": {
+    "message": "Add passkey"
+  },
+  "settings.account.security.passkey.add.button": {
+    "message": "Add passkey"
+  },
+  "settings.account.security.passkey.button": {
+    "message": "Manage passkeys"
+  },
   "settings.account.security.passkey.description": {
     "message": "Manage your registered passkeys, or add a new one."
   },
@@ -4130,6 +4136,9 @@
   "settings.account.security.passkey.modal.no-passkeys": {
     "message": "You do not have any passkeys registered."
   },
+  "settings.account.security.passkey.remove.button": {
+    "message": "Delete passkey"
+  },
   "settings.account.security.passkey.remove.description": {
     "message": "This will permanently remove the passkey \"{name}\". You will no longer be able to sign in with it."
   },
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 325d5a6c20..be9b94786c 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -237,7 +237,7 @@
     "defaultMessage": "Re-install modpack"
   },
   "button.remove": {
-    "defaultMessage": "Delete passkey"
+    "defaultMessage": "Remove"
   },
   "button.remove-image": {
     "defaultMessage": "Remove image"
diff --git a/packages/ui/src/utils/common-messages.ts b/packages/ui/src/utils/common-messages.ts
index c4e2aa8c0d..0932dedd51 100644
--- a/packages/ui/src/utils/common-messages.ts
+++ b/packages/ui/src/utils/common-messages.ts
@@ -245,7 +245,7 @@ export const commonMessages = defineMessages({
 	},
 	removeButton: {
 		id: 'button.remove',
-		defaultMessage: 'Delete passkey',
+		defaultMessage: 'Remove',
 	},
 	removeImageButton: {
 		id: 'button.remove-image',