diff --git a/src/backend/database/routes/ssh.ts b/src/backend/database/routes/ssh.ts
index 9304a647..cf75f4f0 100644
--- a/src/backend/database/routes/ssh.ts
+++ b/src/backend/database/routes/ssh.ts
@@ -91,7 +91,7 @@ router.get("/db/host/internal", async (req: Request, res: Response) => {
           username: host.username,
           password: host.autostartPassword,
           key: host.autostartKey,
-          key_password: host.autostartKeyPassword,
+          keyPassword: host.autostartKeyPassword,
           autostartPassword: host.autostartPassword,
           autostartKey: host.autostartKey,
           autostartKeyPassword: host.autostartKeyPassword,
@@ -151,7 +151,7 @@ router.get("/db/host/internal/all", async (req: Request, res: Response) => {
         username: host.username,
         password: host.autostartPassword || host.password,
         key: host.autostartKey || host.key,
-        key_password: host.autostartKeyPassword || host.key_password,
+        keyPassword: host.autostartKeyPassword || host.key_password,
         autostartPassword: host.autostartPassword,
         autostartKey: host.autostartKey,
         autostartKeyPassword: host.autostartKeyPassword,
@@ -226,7 +226,7 @@ router.post(
       authType,
       credentialId,
       key,
-      key_password,
+      keyPassword,
       keyType,
       pin,
       enableTerminal,
@@ -278,7 +278,7 @@ router.post(
       sshDataObj.keyType = null;
     } else if (effectiveAuthType === "key") {
       sshDataObj.key = key || null;
-      sshDataObj.key_password = key_password || null;
+      sshDataObj.key_password = keyPassword || null;
       sshDataObj.keyType = keyType;
       sshDataObj.password = null;
     } else {
@@ -407,7 +407,7 @@ router.put(
       authType,
       credentialId,
       key,
-      key_password,
+      keyPassword,
       keyType,
       pin,
       enableTerminal,
@@ -464,8 +464,8 @@ router.put(
       if (key) {
         sshDataObj.key = key;
       }
-      if (key_password !== undefined) {
-        sshDataObj.key_password = key_password || null;
+      if (keyPassword !== undefined) {
+        sshDataObj.key_password = keyPassword || null;
       }
       if (keyType) {
         sshDataObj.keyType = keyType;
@@ -711,7 +711,7 @@ router.get(
         authType: resolvedHost.authType,
         password: resolvedHost.password || null,
         key: resolvedHost.key || null,
-        key_password: resolvedHost.key_password || null,
+        keyPassword: resolvedHost.keyPassword || null,
         keyType: resolvedHost.keyType || null,
         folder: resolvedHost.folder,
         tags:
@@ -1234,12 +1234,27 @@ async function resolveHostCredentials(host: any): Promise<any> {
           authType: credential.auth_type || credential.authType,
           password: credential.password,
           key: credential.key,
-          key_password: credential.key_password || credential.key_password,
+          keyPassword: credential.key_password || credential.keyPassword,
           keyType: credential.key_type || credential.keyType,
         };
       }
     }
-    return host;
+
+    const result = { ...host };
+    if (host.key_password !== undefined) {
+      if (result.keyPassword === undefined) {
+        result.keyPassword = host.key_password;
+      }
+      delete result.key_password;
+    }
+    const result = { ...host };
+    if (host.key_password !== undefined) {
+      if (result.keyPassword === undefined) {
+        result.keyPassword = host.key_password;
+      }
+      delete result.key_password;
+    }
+    return result;
   } catch (error) {
     sshLogger.warn(
       `Failed to resolve credentials for host ${host.id}: ${error instanceof Error ? error.message : "Unknown error"}`,
diff --git a/src/backend/ssh/server-stats.ts b/src/backend/ssh/server-stats.ts
index f580bb96..cc8c7e29 100644
--- a/src/backend/ssh/server-stats.ts
+++ b/src/backend/ssh/server-stats.ts
@@ -478,7 +478,7 @@ async function resolveHostCredentials(
 function addLegacyCredentials(baseHost: any, host: any): void {
   baseHost.password = host.password || null;
   baseHost.key = host.key || null;
-  baseHost.keyPassword = host.keyPassword || null;
+  baseHost.keyPassword = host.key_password || host.keyPassword || null;
   baseHost.keyType = host.keyType;
 }
 
diff --git a/src/ui/Desktop/Apps/Host Manager/HostManagerEditor.tsx b/src/ui/Desktop/Apps/Host Manager/HostManagerEditor.tsx
index fe0a2c0b..0fe881ef 100644
--- a/src/ui/Desktop/Apps/Host Manager/HostManagerEditor.tsx	
+++ b/src/ui/Desktop/Apps/Host Manager/HostManagerEditor.tsx	
@@ -877,21 +877,6 @@ export function HostManagerEditor({
                       | "credential";
                     setAuthTab(newAuthType);
                     form.setValue("authType", newAuthType);
-
-                    if (newAuthType === "password") {
-                      form.setValue("key", null);
-                      form.setValue("keyPassword", "");
-                      form.setValue("keyType", "auto");
-                      form.setValue("credentialId", null);
-                    } else if (newAuthType === "key") {
-                      form.setValue("password", "");
-                      form.setValue("credentialId", null);
-                    } else if (newAuthType === "credential") {
-                      form.setValue("password", "");
-                      form.setValue("key", null);
-                      form.setValue("keyPassword", "");
-                      form.setValue("keyType", "auto");
-                    }
                   }}
                   className="flex-1 flex flex-col h-full min-h-0"
                 >
diff --git a/src/ui/Desktop/Apps/Terminal/Terminal.tsx b/src/ui/Desktop/Apps/Terminal/Terminal.tsx
index c4553b59..2de03a7d 100644
--- a/src/ui/Desktop/Apps/Terminal/Terminal.tsx
+++ b/src/ui/Desktop/Apps/Terminal/Terminal.tsx
@@ -512,7 +512,8 @@ export const Terminal = forwardRef<any, SSHTerminalProps>(function SSHTerminal(
       cursorStyle: "bar",
       scrollback: 10000,
       fontSize: 14,
-      fontFamily: '"Caskaydia Cove Nerd Font Mono", "SF Mono", Consolas, "Liberation Mono", monospace',
+      fontFamily:
+        '"Caskaydia Cove Nerd Font Mono", "SF Mono", Consolas, "Liberation Mono", monospace',
       theme: { background: "#18181b", foreground: "#f7f7f7" },
       allowTransparency: true,
       convertEol: true,