diff --git a/package.json b/package.json
index 3f7434a..18f72ec 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
         "type": "git",
         "url": "https://github.com/PropelAuth/node"
     },
-    "version": "2.1.10",
+    "version": "2.1.11",
     "license": "MIT",
     "keywords": [
         "auth",
diff --git a/src/user.ts b/src/user.ts
index 0768e04..3e99677 100644
--- a/src/user.ts
+++ b/src/user.ts
@@ -14,6 +14,7 @@ export type User = {
     metadata?: { [key: string]: any }
     properties?: UserProperties
     loginMethod: LoginMethod
+    activeOrgId?: string
 }
 
 export class UserClass {
@@ -27,6 +28,7 @@ export class UserClass {
     public username?: string
     public properties?: UserProperties
     public loginMethod: LoginMethod
+    public activeOrgId?: string
 
     // If you used our migration APIs to migrate this user from a different system,
     // this is their original ID from that system.
@@ -46,6 +48,18 @@ export class UserClass {
         this.impersonatorUserId = user.impersonatorUserId
         this.properties = user.properties
         this.loginMethod = user.loginMethod
+        this.activeOrgId = user.activeOrgId
+    }
+
+    public getActiveOrg(): OrgMemberInfo | undefined {
+        if (!this.activeOrgId) {
+            return undefined
+        }
+        return this.getOrg(this.activeOrgId)
+    }
+
+    public getActiveOrgId(): string | undefined {
+        return this.activeOrgId
     }
 
     public getOrg(orgId: string): OrgMemberInfo | undefined {
@@ -290,6 +304,7 @@ export type InternalOrgMemberInfo = {
 export type InternalUser = {
     user_id: string
     org_id_to_org_member_info?: { [org_id: string]: InternalOrgMemberInfo }
+    org_member_info?: InternalOrgMemberInfo
 
     email: string
     first_name?: string
@@ -305,9 +320,22 @@ export type InternalUser = {
 }
 
 export function toUser(snake_case: InternalUser): User {
+    let orgIdToOrgMemberInfo: OrgIdToOrgMemberInfo | undefined
+    let activeOrgId: string | undefined
+    if (snake_case.org_member_info) {
+        orgIdToOrgMemberInfo = toOrgIdToOrgMemberInfo({
+            [snake_case.org_member_info.org_id]: snake_case.org_member_info,
+        })
+        activeOrgId = snake_case.org_member_info.org_id
+    } else {
+        orgIdToOrgMemberInfo = toOrgIdToOrgMemberInfo(snake_case.org_id_to_org_member_info)
+        activeOrgId = undefined
+    }
+
     const camelCase: User = {
         userId: snake_case.user_id,
-        orgIdToOrgMemberInfo: toOrgIdToOrgMemberInfo(snake_case.org_id_to_org_member_info),
+        orgIdToOrgMemberInfo,
+        activeOrgId,
         email: snake_case.email,
         firstName: snake_case.first_name,
         lastName: snake_case.last_name,
diff --git a/test/middleware.ts b/test/middleware.ts
index b5fc28f..c810faa 100644
--- a/test/middleware.ts
+++ b/test/middleware.ts
@@ -199,6 +199,44 @@ test("toUser converts correctly with orgs", async () => {
     expect(toUser(internalUser)).toEqual(user)
 })
 
+test("toUser converts correctly with active org", async () => {
+    const internalUser: InternalUser = {
+        user_id: "cbf064e2-edaa-4d35-b413-a8d857329c12",
+        email: "easteregg@propelauth.com",
+        first_name: "easter",
+        org_member_info: {
+            org_id: "99ee1329-e536-4aeb-8e2b-9f56c1b8fe8a",
+            org_name: "orgA",
+            org_metadata: { orgdata_a: "orgvalue_a" },
+            url_safe_org_name: "orga",
+            user_role: "Owner",
+            inherited_user_roles_plus_current_role: ["Owner", "Admin", "Member"],
+            user_permissions: [],
+        },
+    }
+
+    const user: User = {
+        userId: "cbf064e2-edaa-4d35-b413-a8d857329c12",
+        email: "easteregg@propelauth.com",
+        firstName: "easter",
+        orgIdToOrgMemberInfo: {
+            "99ee1329-e536-4aeb-8e2b-9f56c1b8fe8a": new OrgMemberInfo(
+                "99ee1329-e536-4aeb-8e2b-9f56c1b8fe8a",
+                "orgA",
+                { orgdata_a: "orgvalue_a" },
+                "orga",
+                "Owner",
+                ["Owner", "Admin", "Member"],
+                []
+            ),
+        },
+        loginMethod: { loginMethod: "unknown" },
+        activeOrgId: "99ee1329-e536-4aeb-8e2b-9f56c1b8fe8a",
+    }
+
+    expect(toUser(internalUser)).toEqual(user)
+})
+
 test("toUser converts correctly without orgs", async () => {
     const internalUser: InternalUser = {
         user_id: "cbf064e2-edaa-4d35-b413-a8d857329c12",
