diff --git a/api/src/controllers/session.ts b/api/src/controllers/session.ts
index 0337355..e2aae8a 100644
--- a/api/src/controllers/session.ts
+++ b/api/src/controllers/session.ts
@@ -4,8 +4,7 @@ import { UserResponse } from './user'
 import { getSessionController } from './internal'
 import { SessionState } from '../types'
 
-interface SessionResponse extends Omit<UserResponse, 'uid'> {
-  id: string
+interface SessionResponse extends UserResponse {
   needsToUpdatePassword?: boolean
 }
 
@@ -18,7 +17,7 @@ export class SessionController {
    *
    */
   @Example<SessionResponse>({
-    id: 'userIdString',
+    uid: 'userIdString',
     username: 'johnusername',
     displayName: 'John',
     isAdmin: false,
@@ -45,7 +44,7 @@ export class SessionController {
 }
 
 const session = (req: express.Request) => ({
-  id: req.user!.userId,
+  uid: req.user!.userId,
   username: req.user!.username,
   displayName: req.user!.displayName,
   isAdmin: req.user!.isAdmin,
diff --git a/api/src/controllers/web.ts b/api/src/controllers/web.ts
index e0a4d4d..a47a411 100644
--- a/api/src/controllers/web.ts
+++ b/api/src/controllers/web.ts
@@ -121,7 +121,7 @@ const login = async (
 
   req.session.loggedIn = true
   req.session.user = {
-    userId: user.id,
+    userId: user.uid,
     clientId: 'web_app',
     username: user.username,
     displayName: user.displayName,
@@ -134,7 +134,7 @@ const login = async (
   return {
     loggedIn: true,
     user: {
-      id: user.id,
+      uid: user.uid,
       username: user.username,
       displayName: user.displayName,
       isAdmin: user.isAdmin,
diff --git a/api/src/routes/api/spec/web.spec.ts b/api/src/routes/api/spec/web.spec.ts
index 9d7a6e2..d4dac5d 100644
--- a/api/src/routes/api/spec/web.spec.ts
+++ b/api/src/routes/api/spec/web.spec.ts
@@ -145,7 +145,7 @@ describe('web', () => {
 
       expect(res.body.loggedIn).toBeTruthy()
       expect(res.body.user).toEqual({
-        id: expect.any(String),
+        uid: expect.any(String),
         username: user.username,
         displayName: user.displayName,
         isAdmin: user.isAdmin,
diff --git a/api/src/utils/verifyTokenInDB.ts b/api/src/utils/verifyTokenInDB.ts
index d612db9..8ead93f 100644
--- a/api/src/utils/verifyTokenInDB.ts
+++ b/api/src/utils/verifyTokenInDB.ts
@@ -36,7 +36,7 @@ export const verifyTokenInDB = async (
 
   return currentTokenObj?.[tokenType] === token
     ? {
-        userId: dbUser.id,
+        userId: dbUser.uid,
         clientId,
         username: dbUser.username,
         displayName: dbUser.displayName,
diff --git a/web/src/components/login.tsx b/web/src/components/login.tsx
index 0b40419..f9369b2 100644
--- a/web/src/components/login.tsx
+++ b/web/src/components/login.tsx
@@ -40,7 +40,7 @@ const Login = () => {
       })
 
     if (loggedIn) {
-      appContext.setUserId?.(user.id)
+      appContext.setUserId?.(user.uid)
       appContext.setUsername?.(user.username)
       appContext.setDisplayName?.(user.displayName)
       appContext.setIsAdmin?.(user.isAdmin)
diff --git a/web/src/context/appContext.tsx b/web/src/context/appContext.tsx
index cf556a8..ac59544 100644
--- a/web/src/context/appContext.tsx
+++ b/web/src/context/appContext.tsx
@@ -72,7 +72,7 @@ const AppContextProvider = (props: { children: ReactNode }) => {
       .then((res) => res.data)
       .then((data: any) => {
         setCheckingSession(false)
-        setUserId(data.id)
+        setUserId(data.uid)
         setUsername(data.username)
         setDisplayName(data.displayName)
         setIsAdmin(data.isAdmin)