diff --git a/ui/src/i18n/locales/en.ts b/ui/src/i18n/locales/en.ts
index cfe67013fdc..8c66a63c203 100644
--- a/ui/src/i18n/locales/en.ts
+++ b/ui/src/i18n/locales/en.ts
@@ -140,7 +140,7 @@ export const en: TranslationMap = {
   },
   login: {
     subtitle: "Gateway Dashboard",
-    passwordPlaceholder: "optional",
+    tokenPlaceholder: "paste gateway token",
   },
   chat: {
     disconnected: "Disconnected from gateway.",
diff --git a/ui/src/i18n/locales/pt-BR.ts b/ui/src/i18n/locales/pt-BR.ts
index e9ba45392b7..b42234917c5 100644
--- a/ui/src/i18n/locales/pt-BR.ts
+++ b/ui/src/i18n/locales/pt-BR.ts
@@ -142,7 +142,7 @@ export const pt_BR: TranslationMap = {
   },
   login: {
     subtitle: "Painel do Gateway",
-    passwordPlaceholder: "opcional",
+    tokenPlaceholder: "cole o token do gateway",
   },
   chat: {
     disconnected: "Desconectado do gateway.",
diff --git a/ui/src/i18n/locales/zh-CN.ts b/ui/src/i18n/locales/zh-CN.ts
index 585883e3a8f..8fd4d86bd91 100644
--- a/ui/src/i18n/locales/zh-CN.ts
+++ b/ui/src/i18n/locales/zh-CN.ts
@@ -139,7 +139,7 @@ export const zh_CN: TranslationMap = {
   },
   login: {
     subtitle: "网关仪表盘",
-    passwordPlaceholder: "可选",
+    tokenPlaceholder: "粘贴网关令牌",
   },
   chat: {
     disconnected: "已断开与网关的连接。",
diff --git a/ui/src/i18n/locales/zh-TW.ts b/ui/src/i18n/locales/zh-TW.ts
index 95104280846..c480d32fb2b 100644
--- a/ui/src/i18n/locales/zh-TW.ts
+++ b/ui/src/i18n/locales/zh-TW.ts
@@ -139,7 +139,7 @@ export const zh_TW: TranslationMap = {
   },
   login: {
     subtitle: "閘道儀表板",
-    passwordPlaceholder: "可選",
+    tokenPlaceholder: "貼上閘道令牌",
   },
   chat: {
     disconnected: "已斷開與網關的連接。",
diff --git a/ui/src/ui/views/login-gate.ts b/ui/src/ui/views/login-gate.ts
index 58b0033d254..624da905095 100644
--- a/ui/src/ui/views/login-gate.ts
+++ b/ui/src/ui/views/login-gate.ts
@@ -30,15 +30,16 @@ export function renderLoginGate(state: AppViewState) {
             />
           </label>
           <label class="field">
-            <span>${t("overview.access.password")}</span>
+            <span>${t("overview.access.token")}</span>
             <input
               type="password"
               .value=${state.password}
               @input=${(e: Event) => {
                 const v = (e.target as HTMLInputElement).value;
                 state.password = v;
+                state.applySettings({ ...state.settings, token: v });
               }}
-              placeholder="${t("login.passwordPlaceholder")}"
+              placeholder="${t("login.tokenPlaceholder")}"
               @keydown=${(e: KeyboardEvent) => {
                 if (e.key === "Enter") {
                   state.connect();