diff --git a/code/client/src/ui/pages/document/Document.scss b/code/client/src/ui/pages/document/Document.scss
index 516812a4..b708a158 100644
--- a/code/client/src/ui/pages/document/Document.scss
+++ b/code/client/src/ui/pages/document/Document.scss
@@ -1,2 +1,3 @@
 .document {
+  position: relative;
 }
diff --git a/code/client/src/ui/pages/document/Document.tsx b/code/client/src/ui/pages/document/Document.tsx
index fa497194..2a45bc59 100644
--- a/code/client/src/ui/pages/document/Document.tsx
+++ b/code/client/src/ui/pages/document/Document.tsx
@@ -8,6 +8,7 @@ import useDocumentService from '@services/resource/useResourcesService';
 import useConnectors from '@domain/editor/connectors/useConnectors';
 import FloatingButtons from '@ui/pages/document/components/floating-buttons/FloatingButtons';
 import { DocumentResource } from '@notespace/shared/src/workspace/types/resource';
+import Collaborators from '@ui/pages/document/components/collaborators/Collaborators';
 import './Document.scss';
 
 function Document() {
@@ -43,15 +44,14 @@ function Document() {
       setLoaded(true);
     }
     fetchDocument();
-    return () => {
-      socket.emit('leaveDocument');
-    };
+    return () => socket.emit('leaveDocument');
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [id]);
 
   if (!loaded) return null;
   return (
     <div className="document">
+      <Collaborators />
       <Editor title={title} fugue={fugue} connectors={connectors} />
       <FloatingButtons />
     </div>
diff --git a/code/client/src/ui/pages/document/components/collaborators/Collaborators.scss b/code/client/src/ui/pages/document/components/collaborators/Collaborators.scss
new file mode 100644
index 00000000..4e554b45
--- /dev/null
+++ b/code/client/src/ui/pages/document/components/collaborators/Collaborators.scss
@@ -0,0 +1,23 @@
+.collaborators {
+  position: absolute;
+  top: 0;
+  right: 0;
+
+  > div {
+    width: 4vh;
+    height: 4vh;
+    border-radius: 50%;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+    padding: 1vh;
+    margin: 1vh;
+
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    a {
+      text-decoration: none !important;
+      color: white;
+    }
+  }
+}
diff --git a/code/client/src/ui/pages/document/components/collaborators/Collaborators.tsx b/code/client/src/ui/pages/document/components/collaborators/Collaborators.tsx
new file mode 100644
index 00000000..a19f9249
--- /dev/null
+++ b/code/client/src/ui/pages/document/components/collaborators/Collaborators.tsx
@@ -0,0 +1,23 @@
+import useCollaborators from '@ui/pages/document/components/collaborators/useCollaborators';
+import { Link } from 'react-router-dom';
+import './Collaborators.scss';
+
+function Collaborators() {
+  const collaborators = useCollaborators();
+  return (
+    <div className="collaborators">
+      {collaborators.map(collaborator => {
+        const nameParts = collaborator.name.split(' ');
+        const initials =
+          nameParts.length > 1 ? `${nameParts[0][0]}${nameParts[nameParts.length - 1][0]}` : nameParts[0][0];
+        return (
+          <div key={collaborator.id} title={collaborator.name} style={{ backgroundColor: collaborator.color }}>
+            <Link to={`/profile/${collaborator.id}`}>{initials}</Link>
+          </div>
+        );
+      })}
+    </div>
+  );
+}
+
+export default Collaborators;
diff --git a/code/client/src/ui/pages/document/components/collaborators/useCollaborators.ts b/code/client/src/ui/pages/document/components/collaborators/useCollaborators.ts
new file mode 100644
index 00000000..75303838
--- /dev/null
+++ b/code/client/src/ui/pages/document/components/collaborators/useCollaborators.ts
@@ -0,0 +1,26 @@
+import { useState } from 'react';
+import { Collaborator } from '@notespace/shared/src/users/types';
+import useSocketListeners from '@services/communication/socket/useSocketListeners';
+import { useCommunication } from '@/contexts/communication/useCommunication';
+
+function useCollaborators() {
+  const [collaborators, setCollaborators] = useState<Collaborator[]>([]);
+  const { socket } = useCommunication();
+
+  const onCollaboratorsJoined = (users: Collaborator[]) => {
+    setCollaborators(prev => [...prev, ...users]);
+  };
+
+  const onCollaboratorLeft = (id: string) => {
+    setCollaborators(prev => prev.filter(u => u.id !== id));
+  };
+
+  useSocketListeners(socket, {
+    joinedDocument: onCollaboratorsJoined,
+    leftDocument: onCollaboratorLeft,
+  });
+
+  return collaborators;
+}
+
+export default useCollaborators;
diff --git a/code/client/src/ui/pages/workspace/components/DocumentView.tsx b/code/client/src/ui/pages/workspace/components/DocumentView.tsx
index aab14e5a..c22a9849 100644
--- a/code/client/src/ui/pages/workspace/components/DocumentView.tsx
+++ b/code/client/src/ui/pages/workspace/components/DocumentView.tsx
@@ -5,6 +5,7 @@ import { DocumentResource } from '@notespace/shared/src/workspace/types/resource
 import { Checkbox } from '@mui/material';
 import { formatDate, formatTimePassed } from '@/utils/utils';
 import { useEffect, useState } from 'react';
+import useWorkspace from '@/contexts/workspace/useWorkspace';
 
 type DocumentViewProps = {
   document: DocumentResource;
@@ -19,6 +20,7 @@ function DocumentView({ document, onSelect, onDelete, onRename, onDuplicate, sel
   const { wid } = useParams();
   const { component, isEditing, setIsEditing } = useEditing(document.name || 'Untitled', onRename);
   const [isSelected, setSelected] = useState(selected);
+  const { isMember } = useWorkspace();
 
   useEffect(() => {
     setSelected(selected);
@@ -43,6 +45,7 @@ function DocumentView({ document, onSelect, onDelete, onRename, onDuplicate, sel
       onOpenInNewTab={() => window.open(`/workspaces/${wid}/${document.id}`, '_blank')}
       onDuplicate={onDuplicate}
       onDelete={onDelete}
+      enabled={isMember}
     >
       {isEditing ? DocumentComponent : <Link to={`/workspaces/${wid}/${document.id}`}>{DocumentComponent}</Link>}
     </ResourceContextMenu>
diff --git a/code/client/src/ui/pages/workspaces/components/WorkspaceContextMenu.tsx b/code/client/src/ui/pages/workspaces/components/WorkspaceContextMenu.tsx
index cc1fe218..53a44a24 100644
--- a/code/client/src/ui/pages/workspaces/components/WorkspaceContextMenu.tsx
+++ b/code/client/src/ui/pages/workspaces/components/WorkspaceContextMenu.tsx
@@ -35,9 +35,8 @@ function WorkspaceContextMenu({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currentUser]);
 
-  if (!isMember) return null;
   return (
-    <PopupMenu item={children}>
+    <PopupMenu item={children} enabled={isMember}>
       <button onClick={onRename}>
         <MdEdit />
         Rename
diff --git a/code/server/src/controllers/http/handlers/usersHandlers.ts b/code/server/src/controllers/http/handlers/usersHandlers.ts
index a6b97588..e615863e 100644
--- a/code/server/src/controllers/http/handlers/usersHandlers.ts
+++ b/code/server/src/controllers/http/handlers/usersHandlers.ts
@@ -31,8 +31,7 @@ function usersHandlers(service: UsersService) {
     } catch (e) {
       // user not found, continue
       const user = await admin.auth().getUser(uid);
-      const userData = { name: user.displayName!, email: user.email! };
-      await service.createUser(uid, userData);
+      await service.createUser(uid, user.displayName!, user.email!);
       httpResponse.created(res).send();
     }
   };
diff --git a/code/server/src/controllers/http/middlewares/authMiddlewares.ts b/code/server/src/controllers/http/middlewares/authMiddlewares.ts
index b0ac16fc..f1a4fddb 100644
--- a/code/server/src/controllers/http/middlewares/authMiddlewares.ts
+++ b/code/server/src/controllers/http/middlewares/authMiddlewares.ts
@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from 'express';
 import { httpResponse } from '@controllers/http/utils/httpResponse';
-import { LoggedUser } from '@notespace/shared/src/users/types';
+import { UserData } from '@notespace/shared/src/users/types';
 import { ErrorLogger } from '@src/utils/logging';
 import admin from 'firebase-admin';
 
@@ -8,7 +8,7 @@ declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace Express {
     interface Request {
-      user?: LoggedUser;
+      user?: UserData;
     }
   }
 }
@@ -36,7 +36,7 @@ export async function enforceAuth(req: Request, res: Response, next: NextFunctio
   next();
 }
 
-async function verifySessionCookie(sessionCookie: string): Promise<LoggedUser> {
+async function verifySessionCookie(sessionCookie: string): Promise<UserData> {
   const idToken = await admin.auth().verifySessionCookie(sessionCookie, true);
   const { uid, displayName, email } = await admin.auth().getUser(idToken.uid);
   return { id: uid, email: email!, name: displayName! };
diff --git a/code/server/src/controllers/ws/events/document/onCursorChange.ts b/code/server/src/controllers/ws/events/document/onCursorChange.ts
index a7ba1e92..447f05b1 100644
--- a/code/server/src/controllers/ws/events/document/onCursorChange.ts
+++ b/code/server/src/controllers/ws/events/document/onCursorChange.ts
@@ -25,22 +25,27 @@ export function deleteCursor(socket: Socket, documentId: string) {
 }
 
 function updateCursor(socket: Socket, data: CursorData, documentId: string) {
-  const color = getColor(socket);
+  const color = getCursorColor(socket.id);
   const socketData = { ...data, id: socket.id, color };
 
   socket.broadcast.to(documentId).emit('cursorChange', socketData);
 }
 
-function getColor(socket: Socket) {
-  if (!cursorColorsMap.has(socket.id)) {
+export function getCursorColor(socketId: string) {
+  if (!cursorColorsMap.has(socketId)) {
     const randomColor = getRandomColor();
-    cursorColorsMap.set(socket.id, randomColor);
+    cursorColorsMap.set(socketId, randomColor);
   }
-  return cursorColorsMap.get(socket.id);
+  return cursorColorsMap.get(socketId);
 }
 
-function getRandomColor() {
-  return 'hsl(' + Math.random() * 360 + ', 100%, 80%)';
+function getRandomColor(): string {
+  const letters = '0123456789ABCDEF';
+  let color = '#';
+  for (let i = 0; i < 6; i++) {
+    color += letters[Math.floor(Math.random() * 16)];
+  }
+  return color;
 }
 
 export default onCursorChange;
diff --git a/code/server/src/controllers/ws/events/document/onJoinDocument.ts b/code/server/src/controllers/ws/events/document/onJoinDocument.ts
index eee416ab..433d2d31 100644
--- a/code/server/src/controllers/ws/events/document/onJoinDocument.ts
+++ b/code/server/src/controllers/ws/events/document/onJoinDocument.ts
@@ -1,11 +1,33 @@
 import { Socket } from 'socket.io';
 import rooms from '@controllers/ws/rooms/rooms';
 import { InvalidParameterError } from '@domain/errors/errors';
+import { getUserFromSocket } from '@controllers/ws/utils';
+import { getCursorColor } from '@controllers/ws/events/document/onCursorChange';
 
 function onJoinDocument() {
   return function (socket: Socket, documentId: string) {
     if (!documentId) throw new InvalidParameterError('Document id is required');
-    rooms.document.join(socket, documentId);
+
+    // get user
+    const user = getUserFromSocket(socket);
+    if (!user) return;
+
+    // join the document room
+    rooms.document.join(socket, documentId, user);
+
+    // broadcast to all clients in the document
+    socket.in(documentId).emit('joinedDocument', [{ ...user, color: getCursorColor(socket.id) }]);
+
+    // send the clients that are already in the document to the new client
+    const room = rooms.document.getRoom(documentId)!;
+    const users = room
+      .getClients()
+      .map(client => ({
+        ...client.user,
+        color: getCursorColor(client.socketId),
+      }))
+      .filter(u => u.id !== user.id);
+    socket.emit('joinedDocument', users);
   };
 }
 
diff --git a/code/server/src/controllers/ws/events/document/onLeaveDocument.ts b/code/server/src/controllers/ws/events/document/onLeaveDocument.ts
index 0eb951d7..129d9664 100644
--- a/code/server/src/controllers/ws/events/document/onLeaveDocument.ts
+++ b/code/server/src/controllers/ws/events/document/onLeaveDocument.ts
@@ -1,14 +1,23 @@
 import { Socket } from 'socket.io';
 import rooms from '@controllers/ws/rooms/rooms';
 import { deleteCursor } from '@controllers/ws/events/document/onCursorChange';
+import { getUserFromSocket } from '@controllers/ws/utils';
 
 function onLeaveDocument() {
   return function (socket: Socket) {
     const documentId = rooms.document.get(socket.id)?.id;
     if (!documentId) return;
 
-    deleteCursor(socket, documentId);
+    // leave the document room
     rooms.document.leave(socket);
+
+    // delete cursor
+    deleteCursor(socket, documentId);
+
+    // broadcast to all clients in the document
+    const user = getUserFromSocket(socket);
+    if (!user) return;
+    socket.in(documentId).emit('leftDocument', user.id);
   };
 }
 
diff --git a/code/server/src/controllers/ws/events/workspace/onJoinWorkspace.ts b/code/server/src/controllers/ws/events/workspace/onJoinWorkspace.ts
index d38463c4..272361a4 100644
--- a/code/server/src/controllers/ws/events/workspace/onJoinWorkspace.ts
+++ b/code/server/src/controllers/ws/events/workspace/onJoinWorkspace.ts
@@ -15,7 +15,7 @@ function onJoinWorkspace(service: WorkspacesService) {
     if (!user || !members.includes(user.email)) return;
 
     // join the workspace room
-    rooms.workspace.join(socket, id);
+    rooms.workspace.join(socket, id, user);
   };
 }
 
diff --git a/code/server/src/controllers/ws/initSocketEvents.ts b/code/server/src/controllers/ws/initSocketEvents.ts
index 2e3f6feb..cf28f071 100644
--- a/code/server/src/controllers/ws/initSocketEvents.ts
+++ b/code/server/src/controllers/ws/initSocketEvents.ts
@@ -1,7 +1,9 @@
 import { SocketHandler } from '@controllers/ws/types';
 import { Socket } from 'socket.io';
-
 import { ControllersLogger } from '@src/utils/logging';
+import rooms from '@controllers/ws/rooms/rooms';
+import onLeaveDocument from '@controllers/ws/events/document/onLeaveDocument';
+import onLeaveWorkspace from '@controllers/ws/events/workspace/onLeaveWorkspace';
 
 const logger = ControllersLogger('ws');
 
@@ -23,6 +25,12 @@ export default function initSocketEvents(events: Record<string, SocketHandler>)
     });
 
     socket.on('disconnect', reason => {
+      // check if the user is in a document room
+      const isInDocument = rooms.document.isInRoom(socket.id);
+      if (isInDocument) onLeaveDocument()(socket);
+      // check if the user is in a workspace room
+      const isInWorkspace = rooms.workspace.isInRoom(socket.id);
+      if (isInWorkspace) onLeaveWorkspace()(socket);
       logger.logInfo('Client disconnected: ' + reason);
     });
   };
diff --git a/code/server/src/controllers/ws/rooms/Room.ts b/code/server/src/controllers/ws/rooms/Room.ts
index 77bcb385..8b2e9da2 100644
--- a/code/server/src/controllers/ws/rooms/Room.ts
+++ b/code/server/src/controllers/ws/rooms/Room.ts
@@ -1,39 +1,54 @@
+import { UserData } from '@notespace/shared/src/users/types';
+
+type Client = {
+  socketId: string;
+  user: UserData;
+};
+
 /**
  * Room class
- * A room serves to isolate users from each other
- * A user can join a room and leave it
- * Users can only receive messages broadcast to the room they are in
+ * A room serves to isolate clients from each other
+ * A client can join a room and leave it
+ * Clients can only receive messages broadcast to the room they are in
  */
 class Room {
   private readonly roomId: string;
-  private users: string[] = [];
+  private clients: Client[] = [];
 
   constructor(roomId: string) {
     this.roomId = roomId;
   }
 
   /**
-   * Add a user to the room
-   * @param userId
+   * Add a client to the room
+   * @param socketId
+   * @param user
+   */
+  join(socketId: string, user: UserData) {
+    this.clients.push({ socketId, user });
+  }
+
+  /**
+   * Remove a client from the room
+   * @param socketId
    */
-  join(userId: string) {
-    this.users.push(userId);
+  leave(socketId: string) {
+    this.clients = this.clients.filter(u => u.socketId !== socketId);
   }
 
   /**
-   * Remove a user from the room
-   * @param userId
+   * Check if a client is in the room
+   * @param socketId
    */
-  leave(userId: string) {
-    this.users = this.users.filter(id => id !== userId);
+  has(socketId: string) {
+    return this.clients.some(u => u.socketId === socketId);
   }
 
   /**
-   * Check if a user is in the room
-   * @param userId
+   * Get the clients in the room
    */
-  has(userId: string) {
-    return this.users.includes(userId);
+  getClients() {
+    return this.clients;
   }
 
   get id() {
diff --git a/code/server/src/controllers/ws/rooms/operations.ts b/code/server/src/controllers/ws/rooms/operations.ts
index 18c45406..1895b791 100644
--- a/code/server/src/controllers/ws/rooms/operations.ts
+++ b/code/server/src/controllers/ws/rooms/operations.ts
@@ -1,11 +1,12 @@
 import { Socket } from 'socket.io';
 import Room from '@controllers/ws/rooms/Room';
+import { UserData } from '@notespace/shared/src/users/types';
 
-export function joinRoom(rooms: Map<string, Room>, socket: Socket, id: string) {
-  socket.join(id);
-  const room = rooms.get(id) || new Room(id);
-  room.join(socket.id);
-  rooms.set(id, room);
+export function joinRoom(rooms: Map<string, Room>, roomId: string, socket: Socket, user: UserData) {
+  socket.join(roomId);
+  const room = rooms.get(roomId) || new Room(roomId);
+  room.join(socket.id, user);
+  rooms.set(roomId, room);
 }
 
 export function leaveRoom(rooms: Map<string, Room>, socket: Socket) {
diff --git a/code/server/src/controllers/ws/rooms/rooms.ts b/code/server/src/controllers/ws/rooms/rooms.ts
index 89535f02..1567f1fa 100644
--- a/code/server/src/controllers/ws/rooms/rooms.ts
+++ b/code/server/src/controllers/ws/rooms/rooms.ts
@@ -2,6 +2,7 @@ import { Socket } from 'socket.io';
 import Room from '@controllers/ws/rooms/Room';
 import { getRoom, joinRoom, leaveRoom } from '@controllers/ws/rooms/operations';
 import { ForbiddenError } from '@domain/errors/errors';
+import { UserData } from '@notespace/shared/src/users/types';
 
 /**
  * A map of rooms, where the key is an id and the value is the room.
@@ -11,8 +12,8 @@ type Rooms = Map<string, Room>;
 const workspaceRooms: Rooms = new Map();
 const documentRooms: Rooms = new Map();
 
-function joinDocument(socket: Socket, documentId: string) {
-  joinRoom(documentRooms, socket, documentId);
+function joinDocument(socket: Socket, documentId: string, user: UserData) {
+  joinRoom(documentRooms, documentId, socket, user);
 }
 
 function leaveDocument(socket: Socket) {
@@ -31,8 +32,12 @@ function getDocumentRoom(id: string) {
   return documentRooms.get(id);
 }
 
-function joinWorkspace(socket: Socket, workspaceId: string) {
-  joinRoom(workspaceRooms, socket, workspaceId);
+function isInDocumentRoom(socketId: string) {
+  return !!getRoom(documentRooms, socketId);
+}
+
+function joinWorkspace(socket: Socket, workspaceId: string, user: UserData) {
+  joinRoom(workspaceRooms, workspaceId, socket, user);
 }
 
 function leaveWorkspace(socket: Socket) {
@@ -49,17 +54,23 @@ function getWorkspaceRoom(id: string) {
   return workspaceRooms.get(id);
 }
 
+function isInWorkspaceRoom(socketId: string) {
+  return !!getRoom(workspaceRooms, socketId);
+}
+
 export default {
   document: {
     join: joinDocument,
     leave: leaveDocument,
     get: getDocument,
     getRoom: getDocumentRoom,
+    isInRoom: isInDocumentRoom,
   },
   workspace: {
     join: joinWorkspace,
     leave: leaveWorkspace,
     get: getWorkspace,
     getRoom: getWorkspaceRoom,
+    isInRoom: isInWorkspaceRoom,
   },
 };
diff --git a/code/server/src/controllers/ws/utils.ts b/code/server/src/controllers/ws/utils.ts
index 3da962b4..5344f512 100644
--- a/code/server/src/controllers/ws/utils.ts
+++ b/code/server/src/controllers/ws/utils.ts
@@ -1,6 +1,6 @@
-import { LoggedUser } from '@notespace/shared/src/users/types';
+import { UserData } from '@notespace/shared/src/users/types';
 import { Socket } from 'socket.io';
 
 export function getUserFromSocket(socket: Socket) {
-  return (socket.request as any).user as LoggedUser | undefined;
+  return (socket.request as any).user as UserData | undefined;
 }
diff --git a/code/server/src/databases/memory/MemoryUsersDB.ts b/code/server/src/databases/memory/MemoryUsersDB.ts
index 337436ca..ec1cde9a 100644
--- a/code/server/src/databases/memory/MemoryUsersDB.ts
+++ b/code/server/src/databases/memory/MemoryUsersDB.ts
@@ -1,14 +1,15 @@
 import { UsersRepository } from '@databases/types';
-import { User, UserData } from '@notespace/shared/src/users/types';
+import { User } from '@notespace/shared/src/users/types';
 import { Memory } from '@databases/memory/Memory';
 import { NotFoundError } from '@domain/errors/errors';
 
 export class MemoryUsersDB implements UsersRepository {
-  async createUser(id: string, data: UserData): Promise<void> {
+  async createUser(id: string, name: string, email: string): Promise<void> {
     Memory.users[id] = {
       id,
+      name,
+      email,
       createdAt: new Date().toISOString(),
-      ...data,
     };
   }
 
diff --git a/code/server/src/databases/postgres/PostgresResourcesDB.ts b/code/server/src/databases/postgres/PostgresResourcesDB.ts
index 40d060f0..6bad3129 100644
--- a/code/server/src/databases/postgres/PostgresResourcesDB.ts
+++ b/code/server/src/databases/postgres/PostgresResourcesDB.ts
@@ -21,17 +21,18 @@ export class PostgresResourcesDB implements ResourcesRepository {
   }
 
   async getResource(id: string): Promise<Resource> {
-    const results: Resource[] = await sql`select *from resource where id = ${id}`;
+    const results: Resource[] = await sql`
+      select *, updated_at as "updatedAt", created_at as "createdAt" 
+      from resource 
+      where id = ${id}
+    `;
     if (isEmpty(results)) throw new NotFoundError('Resource not found');
     return results[0];
   }
 
   async updateResource(id: string, resource: Partial<Resource>): Promise<void> {
     const { updatedAt, ...rest } = resource;
-    const compatible = {
-      ...rest,
-      updated_at: updatedAt,
-    };
+    const compatible = updatedAt ? { ...rest, updated_at: updatedAt } : rest;
     const results = await sql`
         update resource
         set ${sql(compatible)}
@@ -59,7 +60,7 @@ export class PostgresResourcesDB implements ResourcesRepository {
           where type = 'D' and workspace in (
             select id from workspace where ${email} = any(members)
           )
-          order by updated_at desc
+          order by "updatedAt" desc
           limit 10
         ) as t
     `;
diff --git a/code/server/src/databases/postgres/PostgresUsersDB.ts b/code/server/src/databases/postgres/PostgresUsersDB.ts
index 3984bbfc..dc47c724 100644
--- a/code/server/src/databases/postgres/PostgresUsersDB.ts
+++ b/code/server/src/databases/postgres/PostgresUsersDB.ts
@@ -1,12 +1,12 @@
 import { UsersRepository } from '@databases/types';
-import { User, UserData } from '@notespace/shared/src/users/types';
+import { User } from '@notespace/shared/src/users/types';
 import sql from '@databases/postgres/config';
 import { isEmpty } from 'lodash';
 import { NotFoundError } from '@domain/errors/errors';
 
 export class PostgresUsersDB implements UsersRepository {
-  async createUser(id: string, data: UserData): Promise<void> {
-    await sql`insert into "user" ${sql({ id, ...data })}`;
+  async createUser(id: string, name: string, email: string): Promise<void> {
+    await sql`insert into "user" ${sql({ id, name, email })}`;
   }
 
   async getUser(id: string): Promise<User> {
diff --git a/code/server/src/databases/postgres/PostgresWorkspacesDB.ts b/code/server/src/databases/postgres/PostgresWorkspacesDB.ts
index 2c7248b0..18a710a0 100644
--- a/code/server/src/databases/postgres/PostgresWorkspacesDB.ts
+++ b/code/server/src/databases/postgres/PostgresWorkspacesDB.ts
@@ -22,18 +22,22 @@ export class PostgresWorkspacesDB implements WorkspacesRepository {
     const results = await sql`
       select row_to_json(t) as workspace
       from (
-        select id, name, private, created_at as "createdAt", count(members) as members
+        select id, name, private as "isPrivate", created_at as "createdAt", count(members) as members
         from workspace
         where ${condition}
         group by id
-        order by created_at desc
+        order by "createdAt" desc
       ) as t
     `;
     return results.map(r => r.workspace);
   }
 
   async getWorkspace(id: string): Promise<Workspace> {
-    const results: Workspace[] = await sql`select * from workspace where id = ${id}`;
+    const results: Workspace[] = await sql`
+        select *, private as "isPrivate", created_at as "createdAt"
+        from workspace
+        where id = ${id}
+    `;
     if (isEmpty(results)) throw new NotFoundError(`Workspace not found`);
     return results[0];
   }
diff --git a/code/server/src/databases/types.ts b/code/server/src/databases/types.ts
index 951c7356..340882ca 100644
--- a/code/server/src/databases/types.ts
+++ b/code/server/src/databases/types.ts
@@ -2,7 +2,7 @@ import { DocumentContent } from '@notespace/shared/src/workspace/types/document'
 import { Operation } from '@notespace/shared/src/document/types/operations';
 import { ResourceType, Resource, DocumentResource } from '@notespace/shared/src/workspace/types/resource';
 import { Workspace, WorkspaceMeta } from '@notespace/shared/src/workspace/types/workspace';
-import { User, UserData } from '@notespace/shared/src/users/types';
+import { User } from '@notespace/shared/src/users/types';
 import { SearchParams } from '@src/utils/searchParams';
 import { Commit, CommitMeta } from '@notespace/shared/src/document/types/commits';
 
@@ -132,9 +132,10 @@ export interface UsersRepository {
   /**
    * Create a user in the database
    * @param id
-   * @param data
+   * @param name
+   * @param email
    */
-  createUser: (id: string, data: UserData) => Promise<void>;
+  createUser: (id: string, name: string, email: string) => Promise<void>;
   /**
    * Get a user from the database
    * @param id
diff --git a/code/server/src/services/UsersService.ts b/code/server/src/services/UsersService.ts
index 969d18cd..4d6c8780 100644
--- a/code/server/src/services/UsersService.ts
+++ b/code/server/src/services/UsersService.ts
@@ -1,5 +1,5 @@
 import { Databases } from '@databases/types';
-import { User, UserData } from '@notespace/shared/src/users/types';
+import { User } from '@notespace/shared/src/users/types';
 import { validateId } from '@services/utils';
 
 export class UsersService {
@@ -9,9 +9,9 @@ export class UsersService {
     this.databases = databases;
   }
 
-  async createUser(id: string, data: UserData): Promise<void> {
+  async createUser(id: string, name: string, email: string): Promise<void> {
     validateId(id);
-    await this.databases.users.createUser(id, data);
+    await this.databases.users.createUser(id, name, email);
   }
 
   async getUser(id: string): Promise<User> {
diff --git a/code/server/src/services/utils.ts b/code/server/src/services/utils.ts
index 72841b9b..d2801b15 100644
--- a/code/server/src/services/utils.ts
+++ b/code/server/src/services/utils.ts
@@ -2,7 +2,8 @@ import { InvalidParameterError } from '@domain/errors/errors';
 import { randomBytes } from 'crypto';
 
 const MIN_NAME_LENGTH = 2;
-const MIN_ID_LENGTH = 16;
+const MIN_ID_LENGTH = 8;
+const DEFAULT_ID_LENGTH = 16;
 
 export function validateName(name: string) {
   if (name.length < MIN_NAME_LENGTH) {
@@ -39,7 +40,8 @@ export function decodeFromBase64(base64String: string): any {
   return JSON.parse(jsonString);
 }
 
-export function getRandomId(length: number = 16): string {
-  const randomBuffer = randomBytes(length);
-  return randomBuffer.toString('hex');
+export function getRandomId(length: number = DEFAULT_ID_LENGTH): string {
+  const byteLength = Math.ceil(length / 2); // each byte corresponds to 2 hex characters
+  const randomBuffer = randomBytes(byteLength);
+  return randomBuffer.toString('hex').slice(0, length);
 }
diff --git a/code/server/test/users/users.test.ts b/code/server/test/users/users.test.ts
index 2aadc45a..6c7ecfec 100644
--- a/code/server/test/users/users.test.ts
+++ b/code/server/test/users/users.test.ts
@@ -12,40 +12,26 @@ beforeEach(() => {
 describe('User operations', () => {
   test('should create a user', async () => {
     const id = getRandomId();
-    const userData = {
-      name: 'test',
-      email: 'test@test.com',
-    };
-    await services.users.createUser(id, userData);
+    const name = 'test';
+    const email = 'test@test.com';
+    await services.users.createUser(id, name, email);
     const user = await services.users.getUser(id);
-    expect(user.name).toEqual('test');
-    expect(user.email).toEqual('test@test.com');
+    expect(user.name).toEqual(name);
+    expect(user.email).toEqual(email);
   });
 
   test('should delete a user', async () => {
     const id = getRandomId();
-    const userData = {
-      name: 'test',
-      email: 'test@test.com',
-    };
-    await services.users.createUser(id, userData);
+    await services.users.createUser(id, 'test', 'test@email.com');
     await services.users.deleteUser(id);
     await expect(services.users.getUser(id)).rejects.toThrow('User not found');
   });
 
   test('should get all users', async () => {
     const id1 = getRandomId();
-    const user1Data = {
-      name: 'test1',
-      email: 'test1@test.com',
-    };
     const id2 = getRandomId();
-    const user2Data = {
-      name: 'test2',
-      email: 'test2@test.com',
-    };
-    await services.users.createUser(id1, user1Data);
-    await services.users.createUser(id2, user2Data);
+    await services.users.createUser(id1, 'test1', 'test1@test.com');
+    await services.users.createUser(id2, 'test2', 'test2@test.com');
     const users: User[] = await services.users.getUsers();
     expect(users.some(u => u.id === id1)).toBe(true);
     expect(users.some(u => u.id === id2)).toBe(true);
diff --git a/code/server/test/utils.ts b/code/server/test/utils.ts
index f68803fb..69016f58 100644
--- a/code/server/test/utils.ts
+++ b/code/server/test/utils.ts
@@ -6,9 +6,9 @@ import { Author } from '@notespace/shared/src/document/types/commits';
 
 export async function createTestUserAndWorkspace(services: Services) {
   const userId = getRandomId();
-  const name = 'testUser';
-  const email = 'testUser@test.com';
-  await services.users.createUser(userId, { email, name });
+  const name = 'test';
+  const email = `test${userId}@test.com`;
+  await services.users.createUser(userId, name, email);
   const wid = await services.workspaces.createWorkspace('test', false);
   await services.workspaces.addWorkspaceMember(wid, email);
   return { wid, email, name, userId };
@@ -30,10 +30,9 @@ export async function createTestCommit(services: Services) {
   };
   await services.documents.applyOperations(wid, id, [operation]);
 
-  // commit changes
+  // create commit
   const commitId = await services.documents.commit(id, { id: userId, name });
   const author: Author = { id: userId, name };
-
   return { wid, id, author, commitId, operation };
 }
 
diff --git a/code/shared/src/users/types.ts b/code/shared/src/users/types.ts
index 207dfaba..21a206e8 100644
--- a/code/shared/src/users/types.ts
+++ b/code/shared/src/users/types.ts
@@ -1,13 +1,13 @@
 export type UserData = {
+  id: string;
   name: string;
   email: string;
 };
 
 export type User = UserData & {
-  id: string;
   createdAt: string;
 };
 
-export type LoggedUser = UserData & {
-  id: string;
+export type Collaborator = UserData & {
+  color: string;
 };