diff --git a/frontend/src/routes/settings/account/account-form.svelte b/frontend/src/routes/settings/account/account-form.svelte
index d34b6a12..3b52abdc 100644
--- a/frontend/src/routes/settings/account/account-form.svelte
+++ b/frontend/src/routes/settings/account/account-form.svelte
@@ -38,10 +38,10 @@
 <form onsubmit={onSubmit}>
 	<div class="flex flex-col gap-3 sm:flex-row">
 		<div class="w-full">
-			<FormInput label="Firstname" bind:input={$inputs.firstName} />
+			<FormInput label="First name" bind:input={$inputs.firstName} />
 		</div>
 		<div class="w-full">
-			<FormInput label="Lastname" bind:input={$inputs.lastName} />
+			<FormInput label="Last name" bind:input={$inputs.lastName} />
 		</div>
 	</div>
 	<div class="mt-3 flex flex-col gap-3 sm:flex-row">
diff --git a/frontend/src/routes/settings/admin/users/user-form.svelte b/frontend/src/routes/settings/admin/users/user-form.svelte
index 36fcf42e..14f67f36 100644
--- a/frontend/src/routes/settings/admin/users/user-form.svelte
+++ b/frontend/src/routes/settings/admin/users/user-form.svelte
@@ -56,10 +56,10 @@
 <form onsubmit={onSubmit}>
 	<div class="flex flex-col gap-3 sm:flex-row">
 		<div class="w-full">
-			<FormInput label="Firstname" bind:input={$inputs.firstName} />
+			<FormInput label="First name" bind:input={$inputs.firstName} />
 		</div>
 		<div class="w-full">
-			<FormInput label="Lastname" bind:input={$inputs.lastName} />
+			<FormInput label="Last name" bind:input={$inputs.lastName} />
 		</div>
 	</div>
 	<div class="mt-3 flex flex-col gap-3 sm:flex-row">
diff --git a/frontend/tests/account-settings.spec.ts b/frontend/tests/account-settings.spec.ts
index 00a36b0c..96dcb1c6 100644
--- a/frontend/tests/account-settings.spec.ts
+++ b/frontend/tests/account-settings.spec.ts
@@ -8,8 +8,8 @@ test.beforeEach(cleanupBackend);
 test('Update account details', async ({ page }) => {
 	await page.goto('/settings/account');
 
-	await page.getByLabel('Firstname').fill('Timothy');
-	await page.getByLabel('Lastname').fill('Apple');
+	await page.getByLabel('First name').fill('Timothy');
+	await page.getByLabel('Last name').fill('Apple');
 	await page.getByLabel('Email').fill('timothy.apple@test.com');
 	await page.getByLabel('Username').fill('timothy');
 	await page.getByRole('button', { name: 'Save' }).click();
diff --git a/frontend/tests/user-settings.spec.ts b/frontend/tests/user-settings.spec.ts
index ced31544..0047373f 100644
--- a/frontend/tests/user-settings.spec.ts
+++ b/frontend/tests/user-settings.spec.ts
@@ -10,8 +10,8 @@ test('Create user', async ({ page }) => {
 	await page.goto('/settings/admin/users');
 
 	await page.getByRole('button', { name: 'Add User' }).click();
-	await page.getByLabel('Firstname').fill(user.firstname);
-	await page.getByLabel('Lastname').fill(user.lastname);
+	await page.getByLabel('First name').fill(user.firstname);
+	await page.getByLabel('Last name').fill(user.lastname);
 	await page.getByLabel('Email').fill(user.email);
 	await page.getByLabel('Username').fill(user.username);
 	await page.getByRole('button', { name: 'Save' }).click();
@@ -26,8 +26,8 @@ test('Create user fails with already taken email', async ({ page }) => {
 	await page.goto('/settings/admin/users');
 
 	await page.getByRole('button', { name: 'Add User' }).click();
-	await page.getByLabel('Firstname').fill(user.firstname);
-	await page.getByLabel('Lastname').fill(user.lastname);
+	await page.getByLabel('First name').fill(user.firstname);
+	await page.getByLabel('Last name').fill(user.lastname);
 	await page.getByLabel('Email').fill(users.tim.email);
 	await page.getByLabel('Username').fill(user.username);
 	await page.getByRole('button', { name: 'Save' }).click();
@@ -41,8 +41,8 @@ test('Create user fails with already taken username', async ({ page }) => {
 	await page.goto('/settings/admin/users');
 
 	await page.getByRole('button', { name: 'Add User' }).click();
-	await page.getByLabel('Firstname').fill(user.firstname);
-	await page.getByLabel('Lastname').fill(user.lastname);
+	await page.getByLabel('First name').fill(user.firstname);
+	await page.getByLabel('Last name').fill(user.lastname);
 	await page.getByLabel('Email').fill(user.email);
 	await page.getByLabel('Username').fill(users.tim.username);
 	await page.getByRole('button', { name: 'Save' }).click();
@@ -91,8 +91,8 @@ test('Update user', async ({ page }) => {
 		.click();
 	await page.getByRole('menuitem', { name: 'Edit' }).click();
 
-	await page.getByLabel('Firstname').fill('Crack');
-	await page.getByLabel('Lastname').fill('Apple');
+	await page.getByLabel('First name').fill('Crack');
+	await page.getByLabel('Last name').fill('Apple');
 	await page.getByLabel('Email').fill('crack.apple@test.com');
 	await page.getByLabel('Username').fill('crack');
 	await page.getByRole('button', { name: 'Save' }).click();