diff --git a/frontends/nextjs/src/lib/db/credentials/set-credential.test.ts b/frontends/nextjs/src/lib/db/credentials/set-credential.test.ts
index 3cd9773a1..a3aa410b8 100644
--- a/frontends/nextjs/src/lib/db/credentials/set-credential.test.ts
+++ b/frontends/nextjs/src/lib/db/credentials/set-credential.test.ts
@@ -55,6 +55,7 @@ describe('setCredential', () => {
     // Should always update user's password change timestamp
     expect(mockUpdate).toHaveBeenCalledWith('User', existingUser[0].id, expect.objectContaining({
       passwordChangeTimestamp: expect.any(BigInt),
+      firstLogin: false,
     }))
   })
 })
diff --git a/frontends/nextjs/src/lib/db/credentials/set-credential.ts b/frontends/nextjs/src/lib/db/credentials/set-credential.ts
index fcbc09ff0..face4e75e 100644
--- a/frontends/nextjs/src/lib/db/credentials/set-credential.ts
+++ b/frontends/nextjs/src/lib/db/credentials/set-credential.ts
@@ -22,6 +22,9 @@ export async function setCredential(username: string, passwordHash: string): Pro
   const users = await adapter.list('User', { filter: { username } })
   if (users.data.length > 0) {
     const user = users.data[0] as any
-    await adapter.update('User', user.id, { passwordChangeTimestamp: BigInt(Date.now()) })
+    await adapter.update('User', user.id, {
+      passwordChangeTimestamp: BigInt(Date.now()),
+      firstLogin: false,
+    })
   }
 }