diff --git a/src/user/user.schema.ts b/src/user/user.schema.ts
index 89b1eae..147f659 100644
--- a/src/user/user.schema.ts
+++ b/src/user/user.schema.ts
@@ -96,9 +96,9 @@ const userResponse = z.object({
   pid: z.string(),
   orgId: z
     .object({
-      _id: z.string(),
-      pid: z.string(),
-      name: z.string(),
+      _id: z.string().optional(),
+      pid: z.string().optional(),
+      name: z.string().optional(),
     })
     .optional(),
   firstName: z.string().optional(),
diff --git a/src/user/user.service.ts b/src/user/user.service.ts
index bfc9e45..597ec44 100644
--- a/src/user/user.service.ts
+++ b/src/user/user.service.ts
@@ -52,7 +52,9 @@ export async function createUser(
     }">here</a> to register.`
   );
 
-  return newUser;
+  return userModel
+    .findOne({ pid: newUser.pid })
+    .populate({ path: "orgId", select: "pid name avatar" });
 }
 
 export async function getUser(userId: string) {