diff --git a/src/backend/database/routes/ssh.ts b/src/backend/database/routes/ssh.ts
index 6ccd50c2..2273d6e6 100644
--- a/src/backend/database/routes/ssh.ts
+++ b/src/backend/database/routes/ssh.ts
@@ -1412,7 +1412,7 @@ router.post(
             hostData.authType === "credential" ? hostData.credentialId : null,
           key: hostData.authType === "key" ? hostData.key : null,
           key_password:
-            hostData.authType === "key" ? hostData.keyPassword : null,
+              hostData.authType === "key" ? (hostData.keyPassword || hostData.key_password || null) : null,
           keyType:
             hostData.authType === "key" ? hostData.keyType || "auto" : null,
           pin: hostData.pin || false,
diff --git a/src/backend/database/routes/users.ts b/src/backend/database/routes/users.ts
index 11d600f6..d027c6ec 100644
--- a/src/backend/database/routes/users.ts
+++ b/src/backend/database/routes/users.ts
@@ -894,7 +894,6 @@ router.post("/login", async (req, res) => {
         await authManager.registerUser(userRecord.id, password);
       }
     } catch (setupError) {
-      // Continue if setup fails - authenticateUser will handle it
     }
 
     const dataUnlocked = await authManager.authenticateUser(