diff --git a/options/locale_next/locale_en-US.json b/options/locale_next/locale_en-US.json
index bb4767f461..f73ae37355 100644
--- a/options/locale_next/locale_en-US.json
+++ b/options/locale_next/locale_en-US.json
@@ -456,7 +456,7 @@
 	"actions.runners.create_runner.page_title": "Create new runner",
 	"actions.runners.create_runner.title": "Create new runner",
 	"actions.runners.create_runner.properties_fieldset": "Properties",
-	"actions.runners.create_runner.name_label": "Name*",
+	"actions.runners.create_runner.name_label": "Name",
 	"actions.runners.create_runner.description_label": "Description",
 	"actions.runners.create_runner.create_button": "Create",
 	"actions.runners.create_runner.cancel_button": "Cancel",
@@ -464,7 +464,7 @@
 	"actions.runners.edit_runner.title": "Edit runner %s",
 	"actions.runners.edit_runner.properties_fieldset": "Properties",
 	"actions.runners.edit_runner.properties_options": "Options",
-	"actions.runners.edit_runner.name_label": "Name*",
+	"actions.runners.edit_runner.name_label": "Name",
 	"actions.runners.edit_runner.description_label": "Description",
 	"actions.runners.edit_runner.regenerate_token_label": "Regenerate token",
 	"actions.runners.edit_runner.regenerate_token_help": "The existing token will be invalidated immediately. You will receive a new token on the next page.",
diff --git a/templates/shared/actions/runner_create.tmpl b/templates/shared/actions/runner_create.tmpl
index d34b82cb97..d42005441e 100644
--- a/templates/shared/actions/runner_create.tmpl
+++ b/templates/shared/actions/runner_create.tmpl
@@ -6,7 +6,7 @@
 		<fieldset>
 			<legend>{{ctx.Locale.Tr "actions.runners.create_runner.properties_fieldset"}}</legend>
 			<div class="form-field">
-				<label for="name">{{ctx.Locale.Tr "actions.runners.create_runner.name_label"}}</label>
+				<label class="required" for="name">{{ctx.Locale.Tr "actions.runners.create_runner.name_label"}}</label>
 				<input id="name" name="runner_name" type="text" value="{{.Runner.Name}}"{{if .Err_RunnerName}} class="error"{{end}}>
 			</div>
 			<div class="form-field">
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index cd693abd75..7d5cc02e7f 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -6,7 +6,7 @@
 		<fieldset>
 			<legend>{{ctx.Locale.Tr "actions.runners.edit_runner.properties_fieldset"}}</legend>
 			<div class="form-field">
-				<label for="name">{{ctx.Locale.Tr "actions.runners.edit_runner.name_label"}}</label>
+				<label class="required" for="name">{{ctx.Locale.Tr "actions.runners.edit_runner.name_label"}}</label>
 				<input id="name" name="runner_name" type="text" value="{{.Runner.Name}}" {{if .Err_RunnerName}}class="error"{{end}}>
 			</div>
 			<div class="form-field">
diff --git a/tests/e2e/runner-management.test.e2e.ts b/tests/e2e/runner-management.test.e2e.ts
index ba01a3f870..8f4d5584be 100644
--- a/tests/e2e/runner-management.test.e2e.ts
+++ b/tests/e2e/runner-management.test.e2e.ts
@@ -108,7 +108,7 @@ test.describe('Runners of user2', () => {
     await expect(page.getByRole('paragraph')).toHaveText('Name cannot be empty.');
 
     // Submit a valid form to create a runner.
-    await page.getByRole('textbox', {name: 'Name*'}).fill('runner-991301');
+    await page.getByRole('textbox', {name: 'Name *'}).fill('runner-991301');
     await page.getByRole('textbox', {name: 'Description'}).fill('Description of runner-991301');
 
     await page.getByRole('button', {name: 'Create'}).click();
@@ -155,7 +155,7 @@ test.describe('Runners of user2', () => {
 
     // We have to create a new runner because changes to fixtures would affect the remainder of the tests in this file.
     await page.getByRole('link', {name: 'Create new runner'}).click();
-    await page.getByRole('textbox', {name: 'Name*'}).fill('runner-46635');
+    await page.getByRole('textbox', {name: 'Name *'}).fill('runner-46635');
     await page.getByRole('textbox', {name: 'Description'}).fill('Description of runner-46635');
     await page.getByRole('button', {name: 'Create'}).click();
 
@@ -169,15 +169,15 @@ test.describe('Runners of user2', () => {
     await expect(page.getByRole('heading', {name: 'Edit runner runner-46635'})).toBeVisible();
 
     // Make the form invalid to test validation.
-    await page.getByRole('textbox', {name: 'Name*'}).clear();
+    await page.getByRole('textbox', {name: 'Name *'}).clear();
     await page.getByRole('button', {name: 'Save'}).click();
 
     await expect(page.locator('#flash-message')).toHaveText('Name cannot be empty.');
-    await expect(page.getByRole('textbox', {name: 'Name*'})).toBeEmpty();
+    await expect(page.getByRole('textbox', {name: 'Name *'})).toBeEmpty();
     await expect(page.getByRole('textbox', {name: 'Description'})).toHaveValue('Description of runner-46635');
 
     // Submit a valid form.
-    await page.getByRole('textbox', {name: 'Name*'}).fill('runner-46636');
+    await page.getByRole('textbox', {name: 'Name *'}).fill('runner-46636');
     await page.getByRole('textbox', {name: 'Description'}).fill('Description of runner-46636');
 
     await page.getByRole('button', {name: 'Save'}).click();
@@ -246,7 +246,7 @@ test.describe('Runners of user2', () => {
 
     // We have to create a new runner because changes to fixtures affect the remainder of the tests in this file.
     await page.getByRole('link', {name: 'Create new runner'}).click();
-    await page.getByRole('textbox', {name: 'Name*'}).fill('runner-660332');
+    await page.getByRole('textbox', {name: 'Name *'}).fill('runner-660332');
     await page.getByRole('textbox', {name: 'Description'}).fill('Description of runner-660332');
     await page.getByRole('button', {name: 'Create'}).click();
 
@@ -399,7 +399,7 @@ test.describe('Global runners', () => {
     await expect(page.getByRole('paragraph')).toHaveText('Name cannot be empty.');
 
     // Submit a valid form to create a runner.
-    await page.getByRole('textbox', {name: 'Name*'}).fill('runner-473465');
+    await page.getByRole('textbox', {name: 'Name *'}).fill('runner-473465');
     await page.getByRole('textbox', {name: 'Description'}).fill('Description of runner-473465');
 
     await page.getByRole('button', {name: 'Create'}).click();
@@ -446,7 +446,7 @@ test.describe('Global runners', () => {
 
     // We have to create a new runner because changes to fixtures would affect the remainder of the tests in this file.
     await page.getByRole('link', {name: 'Create new runner'}).click();
-    await page.getByRole('textbox', {name: 'Name*'}).fill('runner-956857');
+    await page.getByRole('textbox', {name: 'Name *'}).fill('runner-956857');
     await page.getByRole('textbox', {name: 'Description'}).fill('Description of runner-956857');
     await page.getByRole('button', {name: 'Create'}).click();
 
@@ -460,15 +460,15 @@ test.describe('Global runners', () => {
     await expect(page.getByRole('heading', {name: 'Edit runner runner-956857'})).toBeVisible();
 
     // Make the form invalid to test validation.
-    await page.getByRole('textbox', {name: 'Name*'}).clear();
+    await page.getByRole('textbox', {name: 'Name *'}).clear();
     await page.getByRole('button', {name: 'Save'}).click();
 
     await expect(page.locator('#flash-message')).toHaveText('Name cannot be empty.');
-    await expect(page.getByRole('textbox', {name: 'Name*'})).toBeEmpty();
+    await expect(page.getByRole('textbox', {name: 'Name *'})).toBeEmpty();
     await expect(page.getByRole('textbox', {name: 'Description'})).toHaveValue('Description of runner-956857');
 
     // Submit a valid form.
-    await page.getByRole('textbox', {name: 'Name*'}).fill('runner-956858');
+    await page.getByRole('textbox', {name: 'Name *'}).fill('runner-956858');
     await page.getByRole('textbox', {name: 'Description'}).fill('Description of runner-956858');
 
     await page.getByRole('button', {name: 'Save'}).click();
@@ -501,7 +501,7 @@ test.describe('Global runners', () => {
 
     // We have to create a new runner because changes to fixtures affect the remainder of the tests in this file.
     await page.getByRole('link', {name: 'Create new runner'}).click();
-    await page.getByRole('textbox', {name: 'Name*'}).fill('runner-650332');
+    await page.getByRole('textbox', {name: 'Name *'}).fill('runner-650332');
     await page.getByRole('textbox', {name: 'Description'}).fill('Description of runner-650332');
     await page.getByRole('button', {name: 'Create'}).click();