diff --git a/apps/desktop/src/components/connection/ConnectionDialog.vue b/apps/desktop/src/components/connection/ConnectionDialog.vue
index 42a43547d3..e8256718ca 100644
--- a/apps/desktop/src/components/connection/ConnectionDialog.vue
+++ b/apps/desktop/src/components/connection/ConnectionDialog.vue
@@ -11,7 +11,7 @@ import PasswordInput from "@/components/ui/PasswordInput.vue";
 import { Label } from "@/components/ui/label";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { HelpTooltip, Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import { Switch } from "@/components/ui/switch";
 import type { ConnectionConfig, ConnectionTestResult, DatabaseConnectionInfo, DatabaseType, HttpTunnelConfig, IdentifierCase, JdbcDriverInfo, JdbcLocalBundleInfo, JdbcMavenBundleInfo, ProxyTunnelConfig, SshConfigHostEntry, SshTunnelConfig, TransportLayerConfig } from "@/types/database";
@@ -5864,11 +5864,15 @@ function openExternalUrl(url: string) {
                   </div>
                   <div class="grid grid-cols-4 items-center gap-4">
                     <span />
-                    <label class="col-span-3 flex items-center gap-2 text-sm">
-                      <input v-model="form.save_password" type="checkbox" class="h-4 w-4 rounded border-border accent-primary" :aria-label="t('connection.savePassword')" />
-                      <span>{{ t("connection.savePassword") }}</span>
-                      <span class="text-xs text-muted-foreground">{{ t("connection.savePasswordHint") }}</span>
-                    </label>
+                    <div class="col-span-3 flex items-center gap-1.5 text-sm">
+                      <label class="flex items-center gap-2">
+                        <input v-model="form.save_password" type="checkbox" class="h-4 w-4 rounded border-border accent-primary" :aria-label="t('connection.savePassword')" />
+                        <span class="whitespace-nowrap">{{ t("connection.savePassword") }}</span>
+                      </label>
+                      <HelpTooltip :label="t('connection.savePassword')">
+                        {{ form.save_password ? t("connection.savePasswordHint") : t("connection.savePasswordSessionHint") }}
+                      </HelpTooltip>
+                    </div>
                   </div>
                   <div class="grid grid-cols-4 items-start gap-4">
                     <Label :class="connectionLabelTopClass">{{ t("connection.jdbcDriverPaths") }}</Label>
@@ -7041,11 +7045,15 @@ function openExternalUrl(url: string) {
 
                   <div class="grid grid-cols-4 items-center gap-4">
                     <span />
-                    <label class="col-span-3 flex items-center gap-2 text-sm">
-                      <input v-model="form.save_password" type="checkbox" class="h-4 w-4 rounded border-border accent-primary" :aria-label="t('connection.savePassword')" />
-                      <span>{{ t("connection.savePassword") }}</span>
-                      <span class="text-xs text-muted-foreground">{{ t("connection.savePasswordHint") }}</span>
-                    </label>
+                    <div class="col-span-3 flex items-center gap-1.5 text-sm">
+                      <label class="flex items-center gap-2">
+                        <input v-model="form.save_password" type="checkbox" class="h-4 w-4 rounded border-border accent-primary" :aria-label="t('connection.savePassword')" />
+                        <span class="whitespace-nowrap">{{ t("connection.savePassword") }}</span>
+                      </label>
+                      <HelpTooltip :label="t('connection.savePassword')">
+                        {{ form.save_password ? t("connection.savePasswordHint") : t("connection.savePasswordSessionHint") }}
+                      </HelpTooltip>
+                    </div>
                   </div>
 
                   <div v-if="form.db_type !== 'hbase' && form.db_type !== 'meilisearch'" class="grid grid-cols-4 items-center gap-4">
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 105311ae3f..8752703613 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -444,7 +444,8 @@ export default {
     user: "User",
     password: "Password",
     savePassword: "Save password",
-    savePasswordHint: "Not saved locally. Kept only for this session and cleared when you quit the app",
+    savePasswordHint: "The password is saved, so you won't need to enter it again.",
+    savePasswordSessionHint: "The password is kept only for this session and cleared when you quit the app.",
     disconnectAndForgetPassword: "Disconnect and Forget Password",
     passwordForgotten: "Password forgotten. Reconnect will ask for it again.",
     promptPasswordTitle: "Enter password",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 4583cf3944..7d38e738c7 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -446,7 +446,8 @@ export default withEnglishFallback({
     user: "Usuario",
     password: "Contraseña",
     savePassword: "Guardar contraseña",
-    savePasswordHint: "No se guarda localmente. Solo se conserva en esta sesión y se borra al salir de la aplicación",
+    savePasswordHint: "La contraseña se guardará para que no tengas que volver a introducirla.",
+    savePasswordSessionHint: "La contraseña se conserva solo durante esta sesión y se borra al salir de la aplicación.",
     disconnectAndForgetPassword: "Desconectar y olvidar la contraseña",
     passwordForgotten: "Contraseña olvidada. La próxima conexión la solicitará de nuevo.",
     promptPasswordTitle: "Introducir contraseña",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index 4f8f228280..07c87dd019 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -445,7 +445,8 @@ export default withEnglishFallback({
     user: "Utente",
     password: "Password",
     savePassword: "Salva password",
-    savePasswordHint: "Non salvata localmente. Conservata solo per questa sessione e cancellata alla chiusura dell'app",
+    savePasswordHint: "La password verrà salvata, quindi non dovrai inserirla di nuovo.",
+    savePasswordSessionHint: "La password viene conservata solo per questa sessione e cancellata alla chiusura dell'app.",
     disconnectAndForgetPassword: "Disconnetti e dimentica la password",
     passwordForgotten: "Password dimenticata. La prossima connessione la richiederà di nuovo.",
     promptPasswordTitle: "Inserisci password",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index d9f1171d94..dbf463b87e 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -445,7 +445,8 @@ export default withEnglishFallback({
     user: "ユーザー",
     password: "パスワード",
     savePassword: "パスワードを保存",
-    savePasswordHint: "ローカルには保存しません。初回接続後、パスワードはこの実行中のみ保持され、アプリ終了時に消去されます。",
+    savePasswordHint: "パスワードを保存し、次回以降の接続では再入力を不要にします。",
+    savePasswordSessionHint: "パスワードは今回の実行中のみ保持され、アプリ終了時に消去されます。",
     disconnectAndForgetPassword: "切断してこのパスワードを忘れる",
     passwordForgotten: "パスワードを忘れました。次回の接続で再入力が必要です。",
     promptPasswordTitle: "パスワードを入力",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 3ae1ac56d2..ba1c1f509d 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -438,7 +438,8 @@ export default withEnglishFallback({
     user: "사용자",
     password: "비밀번호",
     savePassword: "비밀번호 저장",
-    savePasswordHint: "로컬에 저장하지 않습니다. 첫 연결 후 비밀번호는 이번 실행 동안만 유지되며 앱을 종료하면 삭제됩니다.",
+    savePasswordHint: "비밀번호를 저장하여 다음 연결부터 다시 입력하지 않아도 됩니다.",
+    savePasswordSessionHint: "비밀번호는 이번 실행 동안만 유지되며 앱을 종료하면 삭제됩니다.",
     disconnectAndForgetPassword: "연결 끊고 비밀번호 잊기",
     passwordForgotten: "비밀번호를 잊었습니다. 다음 연결 시 다시 입력해야 합니다.",
     promptPasswordTitle: "비밀번호 입력",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index e59167ba85..66478cc84c 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -446,7 +446,8 @@ export default withEnglishFallback({
     user: "Usuário",
     password: "Senha",
     savePassword: "Salvar senha",
-    savePasswordHint: "Não salva localmente. Mantida apenas nesta sessão e apagada ao sair do aplicativo",
+    savePasswordHint: "A senha será salva para que você não precise digitá-la novamente.",
+    savePasswordSessionHint: "A senha é mantida apenas nesta sessão e apagada ao sair do aplicativo.",
     disconnectAndForgetPassword: "Desconectar e Esquecer a Senha",
     passwordForgotten: "Senha esquecida. A próxima conexão pedirá novamente.",
     promptPasswordTitle: "Digite a senha",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index 75bbab1359..f567788a85 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -368,8 +368,9 @@ export default withEnglishFallback({
     sqliteExtensionBrowse: "选择 SQLite 扩展库",
     user: "用户名",
     password: "密码",
-    savePassword: "本地保存密码",
-    savePasswordHint: "不保存到本地。首次连接后，密码仅在本次运行期间保留；退出应用后将清除。",
+    savePassword: "保存密码",
+    savePasswordHint: "密码将被保存，后续连接无需再次输入。",
+    savePasswordSessionHint: "密码仅在本次运行期间保留，退出应用后清除。",
     disconnectAndForgetPassword: "断开并忘记本次密码",
     passwordForgotten: "已忘记密码，下次连接需重新输入。",
     promptPasswordTitle: "输入密码",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 5011e779c5..53d7c80fff 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -445,8 +445,9 @@ export default withEnglishFallback({
     sqliteExtensionBrowse: "選擇 SQLite 擴充庫",
     user: "使用者名稱",
     password: "密碼",
-    savePassword: "本機儲存密碼",
-    savePasswordHint: "不儲存到本機。首次連線後，密碼僅在本次執行期間保留；退出應用程式後將清除。",
+    savePassword: "儲存密碼",
+    savePasswordHint: "密碼將被儲存，後續連線無需再次輸入。",
+    savePasswordSessionHint: "密碼僅在本次執行期間保留，退出應用程式後清除。",
     disconnectAndForgetPassword: "中斷連線並忘記本次密碼",
     passwordForgotten: "已忘記密碼，下次連線需重新輸入。",
     promptPasswordTitle: "輸入密碼",