diff --git a/e2e/fixtures/with-robot.ts b/e2e/fixtures/with-robot.ts
index d169565cf..021a0bead 100644
--- a/e2e/fixtures/with-robot.ts
+++ b/e2e/fixtures/with-robot.ts
@@ -98,12 +98,12 @@ export const activateConnectionConfigByHost = async (page: Page, host: string) =
 
 	await expect(async () => {
 		const rows = page.locator('form').filter({
-			has: page.locator('input[placeholder="Host"]'),
+			has: page.locator('input[placeholder="Remote address"]'),
 		})
 		const count = await rows.count()
 		for (let index = 0; index < count; index += 1) {
 			const row = rows.nth(index)
-			if ((await row.locator('input[placeholder="Host"]').inputValue()) === host) {
+			if ((await row.locator('input[placeholder="Remote address"]').inputValue()) === host) {
 				const switchButton = row.getByRole('switch')
 				if ((await switchButton.getAttribute('aria-checked')) !== 'true') {
 					await switchButton.click()
diff --git a/src/routes/lib/components/Machines.svelte b/src/routes/lib/components/Machines.svelte
index bd96203b8..e096d1cce 100644
--- a/src/routes/lib/components/Machines.svelte
+++ b/src/routes/lib/components/Machines.svelte
@@ -137,7 +137,7 @@
 
 					<Input
 						class="input w-full grow text-xs"
-						placeholder="Host"
+						placeholder="Remote address"
 						value={config.host}
 						on:change={(event) => {
 							connectionConfigs.current[index].host = (event.target as HTMLInputElement).value
@@ -217,12 +217,12 @@
 
 						<label
 							for="{config.host}-address"
-							class="text-xs">Signaling address</label
+							class="text-xs">Address of signaling server</label
 						>
 						<div class="col-span-2">
 							<Input
 								id="{config.host}-address"
-								placeholder="Signaling address"
+								placeholder="Address of signaling server"
 								value={config.signalingAddress}
 								on:change={(event) => {
 									connectionConfigs.current[index].signalingAddress = (