diff --git a/alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.spec.ts b/alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.spec.ts
index 043e5c2e056bb11eb29983c5eef09ce0fa17a74e..43bc3d38565e870585b2ba846b8c2d681d977014 100644
--- a/alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.spec.ts
+++ b/alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.spec.ts
@@ -39,6 +39,7 @@ describe('AdminOrganisationsEinheitRepository', () => {
         (group: GroupRepresentation): AdminOrganisationsEinheit => ({
           name: group.name,
           id: group.id,
+          attributes: group.attributes,
         }),
       );
 
@@ -63,6 +64,7 @@ describe('AdminOrganisationsEinheitRepository', () => {
     const organisationsEinheit: AdminOrganisationsEinheit = {
       name: groupRep.name,
       id: groupRep.id,
+      attributes: groupRep.attributes,
     };
 
     beforeEach(() => {
diff --git a/alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.ts b/alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.ts
index 5dc1b0ee3bf1ea39b1668edf2fa7379a6836f81f..c2d454434e07562492f0c929bc710d7793a70403 100644
--- a/alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.ts
+++ b/alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.ts
@@ -40,6 +40,7 @@ export class AdminOrganisationsEinheitRepository {
     return {
       id: group.id,
       name: group.name,
+      attributes: group.attributes,
     };
   }
 }
diff --git a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.model.ts b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.model.ts
index 8a4b105a948caf4f288a8639468d888d2fb3c255..3a93c42e6b0042f02dd9f509969444431ce6c374 100644
--- a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.model.ts
+++ b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.model.ts
@@ -24,4 +24,5 @@
 export interface AdminOrganisationsEinheit {
   id?: string;
   name: string;
+  attributes: { [key: string]: string[] };
 }
diff --git a/alfa-client/libs/admin/organisations-einheit-shared/src/test/organisations-einheit.ts b/alfa-client/libs/admin/organisations-einheit-shared/src/test/organisations-einheit.ts
index 6bb1baad301e83997665d96347628cf092f1d5ea..aac833df1f46a18a007d4c780e5673dbe5a7ec19 100644
--- a/alfa-client/libs/admin/organisations-einheit-shared/src/test/organisations-einheit.ts
+++ b/alfa-client/libs/admin/organisations-einheit-shared/src/test/organisations-einheit.ts
@@ -29,6 +29,9 @@ export function createAdminOrganisationsEinheit(): AdminOrganisationsEinheit {
   return {
     id: faker.string.uuid(),
     name: faker.lorem.word(),
+    attributes: {
+      organisationseinheitId: [faker.string.uuid()],
+    },
   };
 }
 
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts
index 562b00dafa62d2291eae204de2e79ed2d5b8b98f..2f207e5573f8398234d5d01e201430a4c4e34303 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts
@@ -152,7 +152,10 @@ describe('OrganisationsEinheitContainerComponent', () => {
       it('should call organisationsEinheitService create', () => {
         component.handleDialogResponse(organisationsEinheitResource);
 
-        expect(organisationsEinheitService.create).toHaveBeenCalledWith({ name: organisationsEinheitResource.name });
+        expect(organisationsEinheitService.create).toHaveBeenCalledWith({
+          name: organisationsEinheitResource.name,
+          attributes: { organisationseinheitId: [organisationsEinheitResource.organisationEinheitId] },
+        });
       });
 
       it('should set createOrganisationsEinheitProgress$', () => {
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.ts
index e12a8a85f72d90a48141f6794852f69ebf607085..31e3a25fa7f482c8b85cf9de2a97e8623596d555 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.ts
@@ -80,6 +80,9 @@ export class OrganisationsEinheitContainerComponent implements OnInit, OnDestroy
   mapToAdminOrganisationsEinheit(organisationsEinheitResource: OrganisationsEinheitResource): AdminOrganisationsEinheit {
     return {
       name: organisationsEinheitResource.name,
+      attributes: {
+        organisationseinheitId: [organisationsEinheitResource.organisationEinheitId],
+      },
     };
   }
 }
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user.formservice.spec.ts b/alfa-client/libs/admin/user/src/lib/user-form/user.formservice.spec.ts
index 92031a721d4ebb9e879f75308b003848c82d6cc0..8e823be03c1f064fe2cd152da724bb3e0fcdc001 100644
--- a/alfa-client/libs/admin/user/src/lib/user-form/user.formservice.spec.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-form/user.formservice.spec.ts
@@ -438,7 +438,7 @@ describe('UserFormService', () => {
     });
 
     it('should return bauamt group when active', () => {
-      const organisationsEinheit: AdminOrganisationsEinheit = { name: 'bauamt' };
+      const organisationsEinheit: AdminOrganisationsEinheit = createAdminOrganisationsEinheit();
       organisationsEinheitenGroup.addControl(organisationsEinheit.name, new FormControl(true));
 
       const result: string[] = formService._getActiveOrganisationsEinheiten();
diff --git a/alfa-client/libs/zustaendige-stelle-shared/src/lib/organisations-einheit/organisations-einheit.model.ts b/alfa-client/libs/zustaendige-stelle-shared/src/lib/organisations-einheit/organisations-einheit.model.ts
index a802fe79f851232dcb9c8e27beae5c64f8db2b01..2658c1475c9ca56179e0590d511a948ce3f3adf7 100644
--- a/alfa-client/libs/zustaendige-stelle-shared/src/lib/organisations-einheit/organisations-einheit.model.ts
+++ b/alfa-client/libs/zustaendige-stelle-shared/src/lib/organisations-einheit/organisations-einheit.model.ts
@@ -27,6 +27,7 @@ import { Resource } from '@ngxp/rest';
 export interface OrganisationsEinheit {
   name: string;
   anschrift: Anschrift;
+  organisationEinheitId: string;
 }
 
 export interface Anschrift {
diff --git a/alfa-client/libs/zustaendige-stelle-shared/test/organisations-einheit.ts b/alfa-client/libs/zustaendige-stelle-shared/test/organisations-einheit.ts
index 2257be08968edef9d5287bf9913a6025fe57dd78..d4aa69a51af006f51b1c1ec551f5d212c1e6e647 100644
--- a/alfa-client/libs/zustaendige-stelle-shared/test/organisations-einheit.ts
+++ b/alfa-client/libs/zustaendige-stelle-shared/test/organisations-einheit.ts
@@ -45,6 +45,7 @@ export function createOrganisationsEinheit(): OrganisationsEinheit {
   return {
     name: faker.word.sample(),
     anschrift: createAnschrift(),
+    organisationEinheitId: faker.string.uuid(),
   };
 }