diff --git a/feature-libs/organization/README.md b/feature-libs/organization/README.md
index 14a5f7be6bb..012a896dbf0 100644
--- a/feature-libs/organization/README.md
+++ b/feature-libs/organization/README.md
@@ -1,5 +1,5 @@
-# Spartacus Organization
+# Spartacus My Account
 
-`@spartacus/organization` is a package that you can include in your application, which allows you to use various organization features.
+`@spartacus/my-account` is a package that you can include in your application, which allows you to use various my-account features.
 
 For more information, see [Spartacus](https://github.com/SAP/spartacus).
diff --git a/feature-libs/organization/administration/assets/translations/en/cost-center.i18n.ts b/feature-libs/organization/administration/assets/translations/en/cost-center.i18n.ts
index f814ef9f252..098be39dc65 100644
--- a/feature-libs/organization/administration/assets/translations/en/cost-center.i18n.ts
+++ b/feature-libs/organization/administration/assets/translations/en/cost-center.i18n.ts
@@ -22,11 +22,8 @@ export const costCenter = {
     confirmDisabled: 'Cost Center {{ item.name }} disabled successfully',
   },
 
-  title: 'Details Cost Center',
-  subtitle: 'Cost Center: {{ item.name }}',
-
   details: {
-    title: 'Details Cost Center',
+    title: 'Cost Center Details',
     subtitle: 'Cost Center: {{ item.name }}',
   },
 
diff --git a/feature-libs/organization/administration/assets/translations/en/units.i18n.ts b/feature-libs/organization/administration/assets/translations/en/units.i18n.ts
index 2c06fcafeaa..ee1fa2fc786 100644
--- a/feature-libs/organization/administration/assets/translations/en/units.i18n.ts
+++ b/feature-libs/organization/administration/assets/translations/en/units.i18n.ts
@@ -37,6 +37,7 @@ export const unit = {
     expandAll: 'Expand all',
     collapseAll: 'Collapse all',
   },
+
   children: {
     create: {
       title: 'Create child unit',
@@ -44,6 +45,13 @@ export const unit = {
     },
   },
 
+  costCenters: {
+    create: {
+      title: 'Create cost center',
+      subtitle: '',
+    },
+  },
+
   form: {
     parentOrgUnit: 'Parent business unit',
     create: 'Create Unit',
@@ -74,10 +82,6 @@ export const unit = {
       changes: 'Changes are saved automatically.',
     },
   },
-  // costCenters: {
-  //   header: 'Cost centers in {{code}}',
-  //   new: 'New cost center',
-  // },
 
   breadcrumbs: {
     list: 'All units',
@@ -87,6 +91,7 @@ export const unit = {
     approvers: 'Approvers',
     addresses: 'Shipping addresses',
     addressDetails: '{{formattedAddress}}',
+    costCenters: 'Cost Centers',
   },
 };
 
diff --git a/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.spec.ts b/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.spec.ts
index 13e0845434c..66370413089 100644
--- a/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.spec.ts
+++ b/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.spec.ts
@@ -33,11 +33,15 @@ class MockOrgUnitService {
 }
 
 class MockCurrencyService {
-  getAll() {}
+  getAll() {
+    return of();
+  }
 }
 
 class MockOrganizationItemService {
-  getForm() {}
+  getForm() {
+    return mockForm;
+  }
 }
 
 describe('CostCenterFormComponent', () => {
@@ -78,7 +82,6 @@ describe('CostCenterFormComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(CostCenterFormComponent);
     component = fixture.componentInstance;
-    component.ngOnInit();
   });
 
   it('should create', () => {
@@ -86,7 +89,6 @@ describe('CostCenterFormComponent', () => {
   });
 
   it('should render form controls', () => {
-    component.form = mockForm;
     fixture.detectChanges();
     const formControls = fixture.debugElement.queryAll(By.css('input'));
     expect(formControls.length).toBeGreaterThan(0);
@@ -100,18 +102,10 @@ describe('CostCenterFormComponent', () => {
   });
 
   it('should get currencies from service', () => {
-    component.form = mockForm;
     expect(currencyService.getAll).toHaveBeenCalled();
   });
 
   it('should get active units from service', () => {
-    component.form = mockForm;
     expect(b2bUnitService.getActiveUnitList).toHaveBeenCalled();
   });
-
-  it('should load list of b2bUnits on subscription', () => {
-    component.form = mockForm;
-    fixture.detectChanges();
-    expect(b2bUnitService.loadList).toHaveBeenCalled();
-  });
 });
diff --git a/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.ts b/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.ts
index b316206fe43..fb48e27ddd4 100644
--- a/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.ts
+++ b/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { CostCenter, Currency, CurrencyService } from '@spartacus/core';
 import {
@@ -10,6 +10,7 @@ import { OrganizationItemService } from '../../shared/organization-item.service'
 import { CostCenterItemService } from '../services/cost-center-item.service';
 
 @Component({
+  selector: 'cx-cost-center-form',
   templateUrl: './cost-center-form.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [
@@ -19,8 +20,19 @@ import { CostCenterItemService } from '../services/cost-center-item.service';
     },
   ],
 })
-export class CostCenterFormComponent implements OnInit {
+export class CostCenterFormComponent {
   form: FormGroup = this.itemService.getForm();
+  /**
+   * Initialize the business unit for the cost center.
+   *
+   * If there's a unit provided, we disable the form control.
+   */
+  @Input() set unitKey(value: string) {
+    if (value) {
+      this.form?.get('unit.uid').setValue(value);
+      this.form?.get('unit')?.disable();
+    }
+  }
 
   units$: Observable<B2BUnitNode[]> = this.unitService.getActiveUnitList();
   currencies$: Observable<Currency[]> = this.currencyService.getAll();
@@ -30,8 +42,4 @@ export class CostCenterFormComponent implements OnInit {
     protected unitService: OrgUnitService,
     protected currencyService: CurrencyService
   ) {}
-
-  ngOnInit(): void {
-    this.unitService.loadList();
-  }
 }
diff --git a/feature-libs/organization/administration/components/cost-center/form/cost-center-form.module.ts b/feature-libs/organization/administration/components/cost-center/form/cost-center-form.module.ts
index e4822426728..7a1c4ffc59f 100644
--- a/feature-libs/organization/administration/components/cost-center/form/cost-center-form.module.ts
+++ b/feature-libs/organization/administration/components/cost-center/form/cost-center-form.module.ts
@@ -23,6 +23,5 @@ import { CostCenterFormComponent } from './cost-center-form.component';
   declarations: [CostCenterFormComponent],
   exports: [CostCenterFormComponent],
   providers: [CurrencyService, OrgUnitService],
-  entryComponents: [CostCenterFormComponent],
 })
 export class CostCenterFormModule {}
diff --git a/feature-libs/organization/administration/components/shared/organization-form/organization-form.component.ts b/feature-libs/organization/administration/components/shared/organization-form/organization-form.component.ts
index b17363637c4..1cbc0a64935 100644
--- a/feature-libs/organization/administration/components/shared/organization-form/organization-form.component.ts
+++ b/feature-libs/organization/administration/components/shared/organization-form/organization-form.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
-import { first, map, switchMap } from 'rxjs/operators';
+import { first, map } from 'rxjs/operators';
 import { OrganizationItemService } from '../organization-item.service';
 
 /**
@@ -25,19 +25,15 @@ export class OrganizationFormComponent<T> {
    */
   i18n: string;
 
-  form$: Observable<FormGroup> = this.itemService.unit$.pipe(
-    switchMap((unitUid) =>
-      this.itemService.current$.pipe(
-        map((item) => {
-          this.setI18nRoot(item);
-          if (!item && unitUid) {
-            // TODO: as long as we do not have harmonized unit property, we have to workaround here,
-            item = { parentOrgUnit: { uid: unitUid } } as any;
-          }
-          return this.itemService.getForm(item);
-        })
-      )
-    )
+  form$: Observable<FormGroup> = this.itemService.current$.pipe(
+    map((item) => {
+      this.setI18nRoot(item);
+      if (!item) {
+        // we trick the form builder...
+        item = {} as any;
+      }
+      return this.itemService.getForm(item);
+    })
   );
 
   constructor(protected itemService: OrganizationItemService<T>) {}
@@ -48,7 +44,7 @@ export class OrganizationFormComponent<T> {
     });
   }
 
-  protected setI18nRoot(item) {
+  protected setI18nRoot(item: T): void {
     // concatenate the i18n root with .edit or .create suffix
     this.i18n = this.i18nRoot + (item ? '.edit' : '.create');
   }
diff --git a/feature-libs/organization/administration/components/shared/organization-form/organization-form.service.ts b/feature-libs/organization/administration/components/shared/organization-form/organization-form.service.ts
index a5eb5a1043d..084f03272d9 100644
--- a/feature-libs/organization/administration/components/shared/organization-form/organization-form.service.ts
+++ b/feature-libs/organization/administration/components/shared/organization-form/organization-form.service.ts
@@ -11,12 +11,19 @@ export abstract class OrganizationFormService<T> {
   protected abstract build(item?: T): void;
 
   getForm(item?: T): FormGroup {
+    if (this.form && !!item) {
+      this.patchData(item);
+      return this.form;
+    }
+
     if (!this.form) {
       this.build(item);
     }
+
     // while we should be able to reset with initial value, this doesn't always work
     // hence, we're patching afterwards.
     this.form.reset();
+
     this.form.enable();
     this.patchData(item);
     return this.form;
diff --git a/feature-libs/organization/administration/components/shared/organization-sub-list/assign-cell.component.spec.ts b/feature-libs/organization/administration/components/shared/organization-sub-list/assign-cell.component.spec.ts
index 8983714f7a3..64ad4e94a60 100644
--- a/feature-libs/organization/administration/components/shared/organization-sub-list/assign-cell.component.spec.ts
+++ b/feature-libs/organization/administration/components/shared/organization-sub-list/assign-cell.component.spec.ts
@@ -71,10 +71,6 @@ describe('AssignCellComponent', () => {
       expect(component).toBeTruthy();
     });
 
-    it('should not have an item', () => {
-      expect(component.hasItem).toBeFalsy();
-    });
-
     it('should not be assigned', () => {
       expect(component.isAssigned).toBeFalsy();
     });
@@ -91,10 +87,6 @@ describe('AssignCellComponent', () => {
       expect(component).toBeTruthy();
     });
 
-    it('should have item', () => {
-      expect(component.hasItem).toBeTruthy();
-    });
-
     it('should be assigned', () => {
       expect(component.isAssigned).toBeTruthy();
     });
diff --git a/feature-libs/organization/administration/components/shared/organization-sub-list/assign-cell.component.ts b/feature-libs/organization/administration/components/shared/organization-sub-list/assign-cell.component.ts
index 7e381f6c8a5..b539dd312f4 100644
--- a/feature-libs/organization/administration/components/shared/organization-sub-list/assign-cell.component.ts
+++ b/feature-libs/organization/administration/components/shared/organization-sub-list/assign-cell.component.ts
@@ -6,7 +6,8 @@ import {
 import { OrganizationItemService } from '../organization-item.service';
 import { OrganizationListService } from '../organization-list/organization-list.service';
 import { MessageService } from '../organization-message/services/message.service';
-import { OrganizationSubListService } from './organization-sub-list.service';
+import { OrganizationSubListService } from '../organization-sub-list/organization-sub-list.service';
+import { OrganizationCellComponent } from '../organization-table/organization-cell.component';
 
 @Component({
   template: `
@@ -16,7 +17,9 @@ import { OrganizationSubListService } from './organization-sub-list.service';
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AssignCellComponent<T> implements OnDestroy {
+export class AssignCellComponent<T>
+  extends OrganizationCellComponent
+  implements OnDestroy {
   /**
    * Indicates that we need to show a notification message.
    */
@@ -27,13 +30,8 @@ export class AssignCellComponent<T> implements OnDestroy {
     protected organizationItemService: OrganizationItemService<T>,
     protected messageService: MessageService,
     protected organizationSubListService: OrganizationListService<T>
-  ) {}
-
-  /**
-   * Indicates whether the item is loaded.
-   */
-  get hasItem(): boolean {
-    return !!this.item && Object.keys(this.item).length > 0;
+  ) {
+    super(outlet);
   }
 
   get isAssigned(): boolean {
@@ -81,14 +79,6 @@ export class AssignCellComponent<T> implements OnDestroy {
     );
   }
 
-  protected get item(): T | null {
-    if (!this.outlet.context) {
-      return null;
-    }
-    const { _field, _options, _type, _i18nRoot, ...all } = this.outlet.context;
-    return all as T;
-  }
-
   ngOnDestroy() {
     // We're playing a dirty trick here; The store is not equipped with a
     // selector to select any updated assignments. Moreover, as soon as
diff --git a/feature-libs/organization/administration/components/shared/organization-table/organization-cell.component.ts b/feature-libs/organization/administration/components/shared/organization-table/organization-cell.component.ts
index f599d0e755b..17bd3232966 100644
--- a/feature-libs/organization/administration/components/shared/organization-table/organization-cell.component.ts
+++ b/feature-libs/organization/administration/components/shared/organization-table/organization-cell.component.ts
@@ -59,4 +59,19 @@ export class OrganizationCellComponent {
   get type(): string {
     return this.model._type;
   }
+
+  /**
+   * Indicates whether the item is loaded.
+   */
+  get hasItem(): boolean {
+    return !!this.item && Object.keys(this.item).length > 0;
+  }
+
+  protected get item(): any {
+    if (!this.outlet.context) {
+      return null;
+    }
+    const { _field, _options, _type, _i18nRoot, ...all } = this.outlet.context;
+    return all;
+  }
 }
diff --git a/feature-libs/organization/administration/components/unit/form/unit-form.component.html b/feature-libs/organization/administration/components/unit/form/unit-form.component.html
index bdb5909fd14..eeb3aa608b1 100644
--- a/feature-libs/organization/administration/components/unit/form/unit-form.component.html
+++ b/feature-libs/organization/administration/components/unit/form/unit-form.component.html
@@ -1,5 +1,5 @@
 <cx-organization-form [i18nRoot]="i18nRoot">
-  <ng-container *ngIf="form" [formGroup]="form" main>
+  <ng-container *ngIf="form$ | async as form" [formGroup]="form" main>
     <label>
       <span class="label-content required">{{
         'unit.name' | cxTranslate
diff --git a/feature-libs/organization/administration/components/unit/form/unit-form.component.spec.ts b/feature-libs/organization/administration/components/unit/form/unit-form.component.spec.ts
index 79591cd91ca..e554c808035 100644
--- a/feature-libs/organization/administration/components/unit/form/unit-form.component.spec.ts
+++ b/feature-libs/organization/administration/components/unit/form/unit-form.component.spec.ts
@@ -33,7 +33,12 @@ class MockOrgUnitService {
 }
 
 class MockOrganizationItemService {
-  getForm() {}
+  get unit$() {
+    return of('uid');
+  }
+  getForm() {
+    return mockForm;
+  }
 }
 
 describe('UnitFormComponent', () => {
@@ -67,7 +72,6 @@ describe('UnitFormComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(UnitFormComponent);
     component = fixture.componentInstance;
-    component.ngOnInit();
   });
 
   it('should create', () => {
@@ -75,33 +79,29 @@ describe('UnitFormComponent', () => {
   });
 
   it('should render form controls', () => {
-    component.form = mockForm;
     fixture.detectChanges();
     const formControls = fixture.debugElement.queryAll(By.css('input'));
     expect(formControls.length).toBeGreaterThan(0);
   });
 
-  it('should not render any form controls if the form is falsy', () => {
-    component.form = undefined;
-    fixture.detectChanges();
-    const formControls = fixture.debugElement.queryAll(By.css('input'));
-    expect(formControls.length).toBe(0);
-  });
-
   it('should get active units from service', () => {
-    component.form = mockForm;
+    fixture.detectChanges();
     expect(b2bUnitService.getActiveUnitList).toHaveBeenCalled();
   });
 
   it('should get currencies from service', () => {
-    component.form = mockForm;
     expect(b2bUnitService.getApprovalProcesses).toHaveBeenCalled();
   });
 
   it('should load list of b2bUnits on init', () => {
-    component.form = mockForm;
     component.ngOnInit();
-    fixture.detectChanges();
     expect(b2bUnitService.loadList).toHaveBeenCalled();
   });
+
+  it('should disable parentOrgUnit form control', () => {
+    component.createChildUnit = true;
+    let result: FormGroup;
+    component.form$.subscribe((form) => (result = form)).unsubscribe();
+    expect(result.get('parentOrgUnit.uid').disabled).toBeTruthy();
+  });
 });
diff --git a/feature-libs/organization/administration/components/unit/form/unit-form.component.ts b/feature-libs/organization/administration/components/unit/form/unit-form.component.ts
index c6930d87ea5..338bc0d69f9 100644
--- a/feature-libs/organization/administration/components/unit/form/unit-form.component.ts
+++ b/feature-libs/organization/administration/components/unit/form/unit-form.component.ts
@@ -4,7 +4,6 @@ import {
   Input,
   OnInit,
 } from '@angular/core';
-import { FormGroup } from '@angular/forms';
 import { B2BUnit } from '@spartacus/core';
 import {
   B2BApprovalProcess,
@@ -12,7 +11,7 @@ import {
   OrgUnitService,
 } from '@spartacus/organization/administration/core';
 import { Observable } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import { filter, map, switchMap } from 'rxjs/operators';
 import { OrganizationItemService } from '../../shared/organization-item.service';
 import { UnitItemService } from '../services/unit-item.service';
 @Component({
@@ -28,13 +27,29 @@ import { UnitItemService } from '../services/unit-item.service';
 })
 export class UnitFormComponent implements OnInit {
   @Input() i18nRoot = 'unit';
-  form: FormGroup = this.itemService.getForm();
 
-  units$: Observable<B2BUnitNode[]> = this.unitService
-    .getActiveUnitList()
-    .pipe(
-      map((units) => units.filter((unit) => unit.id !== this.form?.value.uid))
-    );
+  @Input() createChildUnit = false;
+
+  form$: Observable<any> = this.itemService.unit$.pipe(
+    map((unit) => {
+      const form = this.itemService.getForm();
+      form.get('parentOrgUnit.uid')?.setValue(unit);
+      if (this.createChildUnit) {
+        form.get('parentOrgUnit')?.disable();
+      }
+      return form;
+    })
+  );
+
+  units$: Observable<B2BUnitNode[]> = this.form$.pipe(
+    switchMap((form) =>
+      this.unitService
+        .getActiveUnitList()
+        .pipe(
+          map((units) => units.filter((unit) => unit.id !== form?.value.uid))
+        )
+    )
+  );
 
   approvalProcess$: Observable<
     B2BApprovalProcess[]
diff --git a/feature-libs/organization/administration/components/unit/form/unit-form.service.ts b/feature-libs/organization/administration/components/unit/form/unit-form.service.ts
index 14f724abb32..1e3a35a8ff4 100644
--- a/feature-libs/organization/administration/components/unit/form/unit-form.service.ts
+++ b/feature-libs/organization/administration/components/unit/form/unit-form.service.ts
@@ -13,7 +13,7 @@ export class UnitFormService extends OrganizationFormService<B2BUnit> {
     super.patchData(item);
   }
 
-  protected build(item?: B2BUnit) {
+  protected build() {
     const form = new FormGroup({});
     form.setControl(
       'uid',
@@ -32,12 +32,12 @@ export class UnitFormService extends OrganizationFormService<B2BUnit> {
     );
 
     this.form = form;
-    this.toggleParentUnit(item);
+    this.toggleParentUnit();
   }
 
   protected toggleParentUnit(item?: B2BUnit): void {
-    if (item && !item.parentOrgUnit) {
-      this.form.removeControl('parentOrgUnit');
+    if (this.isRootUnit(item)) {
+      this.form?.removeControl('parentOrgUnit');
     } else if (!this.form.get('parentOrgUnit')) {
       this.form.setControl(
         'parentOrgUnit',
@@ -46,9 +46,11 @@ export class UnitFormService extends OrganizationFormService<B2BUnit> {
         })
       );
     }
-    // We disable the parentOrgUnit when it's given by the data.
-    if (item?.uid === undefined && item?.parentOrgUnit) {
-      this.form.get('parentOrgUnit').disable();
-    }
+  }
+
+  protected isRootUnit(item: B2BUnit): boolean {
+    return (
+      item?.uid && (!item?.parentOrgUnit || item?.uid === item?.parentOrgUnit)
+    );
   }
 }
diff --git a/feature-libs/organization/administration/components/unit/guards/active-unit.guard.ts b/feature-libs/organization/administration/components/unit/guards/active-unit.guard.ts
index afb283372c1..a30b8709ad6 100644
--- a/feature-libs/organization/administration/components/unit/guards/active-unit.guard.ts
+++ b/feature-libs/organization/administration/components/unit/guards/active-unit.guard.ts
@@ -14,7 +14,7 @@ export class ActiveUnitGuard extends ExistUnitGuard {
   protected getRedirectUrl(_urlParams?: any): UrlTree {
     const urlPath = this.semanticPathService.transform({
       cxRoute: 'unitDetails',
-      params: { code: _urlParams.code },
+      params: { uid: _urlParams.code },
     });
 
     return this.router.parseUrl(urlPath.join('/'));
diff --git a/feature-libs/organization/administration/components/unit/links/addresses/list/link-cell.component.ts b/feature-libs/organization/administration/components/unit/links/addresses/list/link-cell.component.ts
index 921004789fb..daa1d9c8856 100644
--- a/feature-libs/organization/administration/components/unit/links/addresses/list/link-cell.component.ts
+++ b/feature-libs/organization/administration/components/unit/links/addresses/list/link-cell.component.ts
@@ -12,6 +12,7 @@ import { OrganizationCellComponent } from '../../../../shared/organization-table
     <a
       *ngIf="unitKey$ | async as uid"
       [routerLink]="{ cxRoute: route, params: getRouterModel(uid) } | cxUrl"
+      routerLinkActive="is-current"
       [tabIndex]="tabIndex"
     >
       <span class="text">{{ property }}</span>
diff --git a/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.component.html b/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.component.html
index c202d78d077..0996e2d32af 100644
--- a/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.component.html
+++ b/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.component.html
@@ -1 +1 @@
-<cx-unit-form i18nRoot="unit.children"></cx-unit-form>
+<cx-unit-form [createChildUnit]="true" i18nRoot="unit.children"></cx-unit-form>
diff --git a/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.component.ts b/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.component.ts
index 44ec8ed9c8a..84687f437e5 100644
--- a/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.component.ts
+++ b/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.component.ts
@@ -1,4 +1,5 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { CurrentUnitService } from '../../../services/current-unit.service';
 import { UnitItemService } from '../../../services/unit-item.service';
 import { ChildUnitItemService } from './child-unit-item.service';
 
@@ -14,4 +15,7 @@ import { ChildUnitItemService } from './child-unit-item.service';
     },
   ],
 })
-export class ChildUnitCreateComponent {}
+export class ChildUnitCreateComponent {
+  unitKey$ = this.unitService.key$;
+  constructor(protected unitService: CurrentUnitService) {}
+}
diff --git a/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.module.ts b/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.module.ts
index 31d5a4a986e..56a70247fd0 100644
--- a/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.module.ts
+++ b/feature-libs/organization/administration/components/unit/links/children/create/child-unit-create.module.ts
@@ -1,9 +1,10 @@
+import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { UnitFormModule } from '../../../form/unit-form.module';
 import { ChildUnitCreateComponent } from './child-unit-create.component';
 
 @NgModule({
-  imports: [UnitFormModule],
+  imports: [CommonModule, UnitFormModule],
   declarations: [ChildUnitCreateComponent],
 })
 export class ChildUnitCreateModule {}
diff --git a/feature-libs/organization/administration/components/unit/links/children/create/child-unit-item.service.ts b/feature-libs/organization/administration/components/unit/links/children/create/child-unit-item.service.ts
index 0a661b159d8..2e674dbe3ce 100644
--- a/feature-libs/organization/administration/components/unit/links/children/create/child-unit-item.service.ts
+++ b/feature-libs/organization/administration/components/unit/links/children/create/child-unit-item.service.ts
@@ -22,7 +22,7 @@ export class ChildUnitItemService extends UnitItemService {
   save(form: FormGroup, key?: string) {
     // we enable the parentOrgUnit temporarily so that the underlying
     // save method can read the complete form.value.
-    form.get('parentOrgUnit').enable();
+    form.get('parentOrgUnit')?.enable();
     super.save(form, key);
   }
 
diff --git a/feature-libs/organization/administration/components/unit/links/children/create/current-child-unit.service.ts b/feature-libs/organization/administration/components/unit/links/children/create/current-child-unit.service.ts
index 27e3d0fe139..2a52394298c 100644
--- a/feature-libs/organization/administration/components/unit/links/children/create/current-child-unit.service.ts
+++ b/feature-libs/organization/administration/components/unit/links/children/create/current-child-unit.service.ts
@@ -6,7 +6,8 @@ import { CurrentUnitService } from '../../../services/current-unit.service';
 })
 export class CurrentChildUnitService extends CurrentUnitService {
   protected getParamKey(): string {
-    // this is fake actually
+    // We must come up with a fake param key, to avoid that the (parent) unit
+    // code is loaded from the route parameter map.
     return 'childUnitCode';
   }
 }
diff --git a/feature-libs/organization/administration/components/unit/links/cost-centers/create/index.ts b/feature-libs/organization/administration/components/unit/links/cost-centers/create/index.ts
new file mode 100644
index 00000000000..bbf8ba38ee4
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/cost-centers/create/index.ts
@@ -0,0 +1,3 @@
+export * from './unit-cost-center-create.component';
+export * from './unit-cost-center-create.module';
+export * from './unit-cost-center-item.service';
diff --git a/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-create.component.html b/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-create.component.html
new file mode 100644
index 00000000000..2fe70d96d66
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-create.component.html
@@ -0,0 +1 @@
+<cx-cost-center-form [unitKey]="unitKey$ | async"></cx-cost-center-form>
diff --git a/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-create.component.ts b/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-create.component.ts
new file mode 100644
index 00000000000..7be37074dcd
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-create.component.ts
@@ -0,0 +1,21 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { CostCenterItemService } from '../../../../cost-center/services/cost-center-item.service';
+import { CurrentUnitService } from '../../../services/current-unit.service';
+import { UnitCostCenterItemService } from './unit-cost-center-item.service';
+
+@Component({
+  templateUrl: './unit-cost-center-create.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: [
+    // we provide a specific version of the `CostCenterItemService` to
+    // let the form component work with unit cost centers.
+    {
+      provide: CostCenterItemService,
+      useExisting: UnitCostCenterItemService,
+    },
+  ],
+})
+export class UnitCostCenterCreateComponent {
+  unitKey$ = this.unitService.key$;
+  constructor(protected unitService: CurrentUnitService) {}
+}
diff --git a/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-create.module.ts b/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-create.module.ts
new file mode 100644
index 00000000000..cef753800ef
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-create.module.ts
@@ -0,0 +1,10 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { CostCenterFormModule } from '../../../../cost-center/form/cost-center-form.module';
+import { UnitCostCenterCreateComponent } from './unit-cost-center-create.component';
+
+@NgModule({
+  imports: [CommonModule, CostCenterFormModule],
+  declarations: [UnitCostCenterCreateComponent],
+})
+export class UnitCostCenterCreateModule {}
diff --git a/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-item.service.spec.ts b/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-item.service.spec.ts
new file mode 100644
index 00000000000..1778f104499
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-item.service.spec.ts
@@ -0,0 +1,92 @@
+import { TestBed } from '@angular/core/testing';
+import { FormControl, FormGroup } from '@angular/forms';
+import { RoutingService } from '@spartacus/core';
+import {
+  Budget,
+  CostCenterService,
+  LoadStatus,
+  OrganizationItemStatus,
+} from '@spartacus/organization/administration/core';
+import { Observable, of } from 'rxjs';
+import { CostCenterFormService } from '../../../../cost-center/form/cost-center-form.service';
+import { CurrentCostCenterService } from '../../../../cost-center/services/current-cost-center.service';
+import { UnitCostCenterItemService } from './unit-cost-center-item.service';
+
+class MockRoutingService {
+  go() {}
+}
+
+class MockCostCenterService {
+  load() {}
+  get() {
+    return of();
+  }
+  update() {}
+  getLoadingStatus(): Observable<OrganizationItemStatus<Budget>> {
+    return of({ status: LoadStatus.SUCCESS, item: {} });
+  }
+  create() {}
+}
+
+class MockCurrentCostCenterService {}
+class MockCostCenterFormService {}
+
+describe('UnitCostCenterItemService', () => {
+  let service: UnitCostCenterItemService;
+  let costCenterService: CostCenterService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        UnitCostCenterItemService,
+        {
+          provide: CurrentCostCenterService,
+          useClass: MockCurrentCostCenterService,
+        },
+        { provide: RoutingService, useClass: MockRoutingService },
+        { provide: CostCenterFormService, useClass: MockCostCenterFormService },
+        { provide: CostCenterService, useClass: MockCostCenterService },
+      ],
+    });
+
+    service = TestBed.inject(UnitCostCenterItemService);
+    costCenterService = TestBed.inject(CostCenterService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should create cost center with unit.uid', () => {
+    spyOn(costCenterService, 'create').and.callThrough();
+    const form = new FormGroup({});
+    form.setControl('name', new FormControl('cc name'));
+    form.setControl(
+      'unit',
+      new FormGroup({
+        uid: new FormControl('unit-uid'),
+      })
+    );
+    form.get('unit').disable();
+    service.save(form);
+
+    expect(costCenterService.create).toHaveBeenCalledWith({
+      name: 'cc name',
+      unit: { uid: 'unit-uid' },
+    });
+  });
+
+  it('should launch orgUnitCostCenters with unit uid', () => {
+    const routingService = TestBed.inject(RoutingService);
+    spyOn(routingService, 'go').and.callThrough();
+    service.launchDetails({
+      code: 'c-1',
+      name: 'foo bar',
+      unit: { uid: 'unitUid' },
+    });
+    expect(routingService.go).toHaveBeenCalledWith({
+      cxRoute: 'orgUnitCostCenters',
+      params: { uid: 'unitUid' },
+    });
+  });
+});
diff --git a/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-item.service.ts b/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-item.service.ts
new file mode 100644
index 00000000000..cc2461f2bae
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/cost-centers/create/unit-cost-center-item.service.ts
@@ -0,0 +1,28 @@
+import { Injectable } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+import { CostCenter } from '@spartacus/core';
+import { CostCenterItemService } from '../../../../cost-center/services/cost-center-item.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class UnitCostCenterItemService extends CostCenterItemService {
+  save(form: FormGroup, key?: string) {
+    // we enable the unit so that the underlying
+    // save method can read the complete form.value.
+    form.get('unit').enable();
+    super.save(form, key);
+  }
+
+  /**
+   * @override
+   * Returns 'orgUnitCostCenters'
+   */
+  protected getDetailsRoute(): string {
+    return 'orgUnitCostCenters';
+  }
+
+  protected getRouteParams(item: CostCenter) {
+    return { uid: item.unit.uid };
+  }
+}
diff --git a/feature-libs/organization/administration/components/unit/links/cost-centers/index.ts b/feature-libs/organization/administration/components/unit/links/cost-centers/index.ts
index fad9e464694..28f6edcd044 100644
--- a/feature-libs/organization/administration/components/unit/links/cost-centers/index.ts
+++ b/feature-libs/organization/administration/components/unit/links/cost-centers/index.ts
@@ -1,3 +1,4 @@
+export * from './create/index';
 export * from './unit-cost-centers.component';
 export * from './unit-cost-centers.module';
 export * from './unit-cost-centers.service';
diff --git a/feature-libs/organization/administration/components/unit/links/cost-centers/unit-cost-centers.component.html b/feature-libs/organization/administration/components/unit/links/cost-centers/unit-cost-centers.component.html
index 210c5c6825c..560d74f8669 100644
--- a/feature-libs/organization/administration/components/unit/links/cost-centers/unit-cost-centers.component.html
+++ b/feature-libs/organization/administration/components/unit/links/cost-centers/unit-cost-centers.component.html
@@ -1 +1,5 @@
-<cx-organization-sub-list> </cx-organization-sub-list>
+<cx-organization-sub-list>
+  <a actions class="link" routerLink="create">
+    {{ 'organization.create' | cxTranslate }}
+  </a>
+</cx-organization-sub-list>
diff --git a/feature-libs/organization/administration/components/unit/links/users/create/index.ts b/feature-libs/organization/administration/components/unit/links/users/create/index.ts
new file mode 100644
index 00000000000..801e6a07813
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/users/create/index.ts
@@ -0,0 +1,2 @@
+export * from './unit-user-create.component';
+export * from './unit-user-create.module';
diff --git a/feature-libs/organization/administration/components/unit/links/users/create/unit-user-create.component.html b/feature-libs/organization/administration/components/unit/links/users/create/unit-user-create.component.html
new file mode 100644
index 00000000000..3be4745b7fe
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/users/create/unit-user-create.component.html
@@ -0,0 +1 @@
+<cx-user-form [unitKey]="unitKey$ | async" i18nRoot="unit.users"></cx-user-form>
diff --git a/feature-libs/organization/administration/components/unit/links/users/create/unit-user-create.component.ts b/feature-libs/organization/administration/components/unit/links/users/create/unit-user-create.component.ts
new file mode 100644
index 00000000000..03b8d1c3d7b
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/users/create/unit-user-create.component.ts
@@ -0,0 +1,21 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { UserItemService } from '../../../../user/services/user-item.service';
+import { CurrentUnitService } from '../../../services/current-unit.service';
+import { UnitUserItemService } from './unit-user-item.service';
+
+@Component({
+  templateUrl: './unit-user-create.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: [
+    // we provide a specific version of the `UnitItemService` to
+    // let the form component work with child units.
+    {
+      provide: UserItemService,
+      useExisting: UnitUserItemService,
+    },
+  ],
+})
+export class UnitUserCreateComponent {
+  unitKey$ = this.unitService.key$;
+  constructor(protected unitService: CurrentUnitService) {}
+}
diff --git a/feature-libs/organization/administration/components/unit/links/users/create/unit-user-create.module.ts b/feature-libs/organization/administration/components/unit/links/users/create/unit-user-create.module.ts
new file mode 100644
index 00000000000..a6f86904738
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/users/create/unit-user-create.module.ts
@@ -0,0 +1,10 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { UserFormModule } from '../../../../user/form/user-form.module';
+import { UnitUserCreateComponent } from './unit-user-create.component';
+
+@NgModule({
+  imports: [CommonModule, UserFormModule],
+  declarations: [UnitUserCreateComponent],
+})
+export class UnitUserCreateModule {}
diff --git a/feature-libs/organization/administration/components/unit/links/users/create/unit-user-item.service.spec.ts b/feature-libs/organization/administration/components/unit/links/users/create/unit-user-item.service.spec.ts
new file mode 100644
index 00000000000..825d28442e6
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/users/create/unit-user-item.service.spec.ts
@@ -0,0 +1,89 @@
+import { TestBed } from '@angular/core/testing';
+import { FormControl, FormGroup } from '@angular/forms';
+import { RoutingService } from '@spartacus/core';
+import {
+  B2BUserService,
+  Budget,
+  LoadStatus,
+  OrganizationItemStatus,
+} from '@spartacus/organization/administration/core';
+import { Observable, of } from 'rxjs';
+import { UnitFormService } from '../../../form/unit-form.service';
+import { UnitUserItemService } from './unit-user-item.service';
+
+class MockRoutingService {
+  go() {}
+  getParams() {
+    return of();
+  }
+}
+
+class MockB2bUserService {
+  get() {
+    return of();
+  }
+  loadBudget() {}
+  update() {}
+  create() {}
+  getLoadingStatus(): Observable<OrganizationItemStatus<Budget>> {
+    return of({ status: LoadStatus.SUCCESS, item: {} });
+  }
+}
+
+class MockUnitFormService {}
+
+describe('ChildUnitItemService', () => {
+  let service: UnitUserItemService;
+  let userService: B2BUserService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        UnitUserItemService,
+        { provide: RoutingService, useClass: MockRoutingService },
+        { provide: UnitFormService, useClass: MockUnitFormService },
+        { provide: B2BUserService, useClass: MockB2bUserService },
+      ],
+    });
+
+    service = TestBed.inject(UnitUserItemService);
+    userService = TestBed.inject(B2BUserService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should create item with unitUid', () => {
+    spyOn(userService, 'create').and.callThrough();
+    const form = new FormGroup({});
+    form.setControl('name', new FormControl('User name'));
+    form.setControl(
+      'orgUnit',
+      new FormGroup({
+        uid: new FormControl('unit-uid'),
+      })
+    );
+    form.get('orgUnit').disable();
+    service.save(form);
+
+    expect(userService.create).toHaveBeenCalledWith({
+      name: 'User name',
+      orgUnit: { uid: 'unit-uid' },
+    });
+  });
+
+  it('should launch orgUnitChildren with unitUid uid', () => {
+    const routingService = TestBed.inject(RoutingService);
+    spyOn(routingService, 'go').and.callThrough();
+    service.launchDetails({
+      uid: 'uid',
+      name: 'foo bar',
+      orgUnit: { uid: 'unitUid' },
+    });
+    expect(routingService.go).toHaveBeenCalledWith({
+      cxRoute: 'unitUserList',
+      params: { uid: 'unitUid' },
+    });
+  });
+});
diff --git a/feature-libs/organization/administration/components/unit/links/users/create/unit-user-item.service.ts b/feature-libs/organization/administration/components/unit/links/users/create/unit-user-item.service.ts
new file mode 100644
index 00000000000..f593008c893
--- /dev/null
+++ b/feature-libs/organization/administration/components/unit/links/users/create/unit-user-item.service.ts
@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+import { B2BUser } from '@spartacus/core';
+import { UserItemService } from '../../../../user/services/user-item.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class UnitUserItemService extends UserItemService {
+  save(form: FormGroup, key?: string) {
+    // we enable the orgUnit temporarily so that the underlying
+    // save method can read the complete form.value.
+    form.get('orgUnit')?.enable();
+    super.save(form, key);
+  }
+
+  /**
+   * @override
+   * Returns 'unitDetails'
+   */
+  protected getDetailsRoute(): string {
+    return 'unitUserList';
+  }
+
+  protected getRouteParams(item: B2BUser) {
+    return { uid: item.orgUnit.uid };
+  }
+
+  // @override to default method
+  launchDetails(item: B2BUser): void {
+    const cxRoute = this.getDetailsRoute();
+    const params = this.getRouteParams(item);
+    if (cxRoute && item && Object.keys(item).length > 0) {
+      this.routingService.go({ cxRoute, params });
+    }
+  }
+}
diff --git a/feature-libs/organization/administration/components/unit/links/users/index.ts b/feature-libs/organization/administration/components/unit/links/users/index.ts
index 444eb80e7b2..9d9cc2844fc 100644
--- a/feature-libs/organization/administration/components/unit/links/users/index.ts
+++ b/feature-libs/organization/administration/components/unit/links/users/index.ts
@@ -1,3 +1,4 @@
+export * from './create/index';
 export * from './list/index';
 export * from './roles/index';
 export * from './services/index';
diff --git a/feature-libs/organization/administration/components/unit/links/users/list/unit-user-link-cell.component.ts b/feature-libs/organization/administration/components/unit/links/users/list/unit-user-link-cell.component.ts
index a826d57866b..7d37a105d37 100644
--- a/feature-libs/organization/administration/components/unit/links/users/list/unit-user-link-cell.component.ts
+++ b/feature-libs/organization/administration/components/unit/links/users/list/unit-user-link-cell.component.ts
@@ -10,7 +10,7 @@ import { OrganizationCellComponent } from '../../../../shared/organization-table
 @Component({
   template: `
     <a
-      *ngIf="unitKey$ | async as uid"
+      *ngIf="hasItem && unitKey$ | async as uid"
       [routerLink]="
         { cxRoute: 'unitUserRoles', params: getRouterModel(uid) } | cxUrl
       "
diff --git a/feature-libs/organization/administration/components/unit/links/users/list/unit-user-list.component.html b/feature-libs/organization/administration/components/unit/links/users/list/unit-user-list.component.html
index 210c5c6825c..560d74f8669 100644
--- a/feature-libs/organization/administration/components/unit/links/users/list/unit-user-list.component.html
+++ b/feature-libs/organization/administration/components/unit/links/users/list/unit-user-list.component.html
@@ -1 +1,5 @@
-<cx-organization-sub-list> </cx-organization-sub-list>
+<cx-organization-sub-list>
+  <a actions class="link" routerLink="create">
+    {{ 'organization.create' | cxTranslate }}
+  </a>
+</cx-organization-sub-list>
diff --git a/feature-libs/organization/administration/components/unit/links/users/roles/index.ts b/feature-libs/organization/administration/components/unit/links/users/roles/index.ts
index 506453aaf4e..bdb05810f0b 100644
--- a/feature-libs/organization/administration/components/unit/links/users/roles/index.ts
+++ b/feature-libs/organization/administration/components/unit/links/users/roles/index.ts
@@ -1,3 +1,4 @@
 export * from './unit-user-roles-form.service';
+export * from './unit-user-roles-item.service';
 export * from './unit-user-roles.component';
 export * from './unit-user-roles.module';
diff --git a/feature-libs/organization/administration/components/unit/links/users/services/unit-user-item.service.ts b/feature-libs/organization/administration/components/unit/links/users/roles/unit-user-roles-item.service.ts
similarity index 70%
rename from feature-libs/organization/administration/components/unit/links/users/services/unit-user-item.service.ts
rename to feature-libs/organization/administration/components/unit/links/users/roles/unit-user-roles-item.service.ts
index 1adc2494271..8c28a78d77e 100644
--- a/feature-libs/organization/administration/components/unit/links/users/services/unit-user-item.service.ts
+++ b/feature-libs/organization/administration/components/unit/links/users/roles/unit-user-roles-item.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { FormGroup } from '@angular/forms';
 import { B2BUser, RoutingService } from '@spartacus/core';
 import {
   B2BUserService,
@@ -7,12 +8,12 @@ import {
 } from '@spartacus/organization/administration/core';
 import { Observable } from 'rxjs';
 import { OrganizationItemService } from '../../../../shared/organization-item.service';
-import { UnitUserRolesFormService } from '../roles/unit-user-roles-form.service';
-import { CurrentUnitUserService } from './current-unit-user.service';
+import { CurrentUnitUserService } from '../services/current-unit-user.service';
+import { UnitUserRolesFormService } from './unit-user-roles-form.service';
 @Injectable({
   providedIn: 'root',
 })
-export class UnitUserItemService extends OrganizationItemService<B2BUser> {
+export class UnitUserRolesItemService extends OrganizationItemService<B2BUser> {
   constructor(
     protected currentItemService: CurrentUnitUserService,
     protected routingService: RoutingService,
@@ -23,6 +24,13 @@ export class UnitUserItemService extends OrganizationItemService<B2BUser> {
     super(currentItemService, routingService, formService);
   }
 
+  save(form: FormGroup, key?: string) {
+    // we enable the unit so that the underlying
+    // save method can read the complete form.value.
+    form.get('orgUnit').enable();
+    super.save(form, key);
+  }
+
   load(unitUid: string): Observable<B2BUser> {
     return this.b2bUserService.get(unitUid);
   }
diff --git a/feature-libs/organization/administration/components/unit/links/users/roles/unit-user-roles.component.ts b/feature-libs/organization/administration/components/unit/links/users/roles/unit-user-roles.component.ts
index 369d9710c2e..555acdcf4fc 100644
--- a/feature-libs/organization/administration/components/unit/links/users/roles/unit-user-roles.component.ts
+++ b/feature-libs/organization/administration/components/unit/links/users/roles/unit-user-roles.component.ts
@@ -6,8 +6,8 @@ import { Observable } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 import { OrganizationItemService } from '../../../../shared/organization-item.service';
 import { MessageService } from '../../../../shared/organization-message/services/message.service';
-import { UnitUserItemService } from '../services/unit-user-item.service';
 import { UnitUserRolesFormService } from './unit-user-roles-form.service';
+import { UnitUserRolesItemService } from './unit-user-roles-item.service';
 
 @Component({
   templateUrl: './unit-user-roles.component.html',
@@ -15,7 +15,7 @@ import { UnitUserRolesFormService } from './unit-user-roles-form.service';
   providers: [
     {
       provide: OrganizationItemService,
-      useExisting: UnitUserItemService,
+      useExisting: UnitUserRolesItemService,
     },
   ],
 })
diff --git a/feature-libs/organization/administration/components/unit/links/users/services/index.ts b/feature-libs/organization/administration/components/unit/links/users/services/index.ts
index 88c2e8cf363..394adc05977 100644
--- a/feature-libs/organization/administration/components/unit/links/users/services/index.ts
+++ b/feature-libs/organization/administration/components/unit/links/users/services/index.ts
@@ -1,3 +1,2 @@
 export * from './current-unit-user.service';
-export * from './unit-user-item.service';
 export * from './unit-user-list.service';
diff --git a/feature-libs/organization/administration/components/unit/units.config.ts b/feature-libs/organization/administration/components/unit/units.config.ts
index a8f54c7be13..149bc9c2e4e 100644
--- a/feature-libs/organization/administration/components/unit/units.config.ts
+++ b/feature-libs/organization/administration/components/unit/units.config.ts
@@ -27,6 +27,10 @@ import { UnitApproverListComponent } from './links/approvers/unit-approver-list.
 import { ChildUnitCreateComponent } from './links/children/create/child-unit-create.component';
 import { UnitChildrenComponent } from './links/children/unit-children.component';
 import { UnitCostCenterListComponent } from './links/cost-centers/unit-cost-centers.component';
+import {
+  UnitCostCenterCreateComponent,
+  UnitUserCreateComponent,
+} from './links/index';
 import { UnitUserRolesCellComponent } from './links/users/list/unit-user-link-cell.component';
 import { UnitUserListComponent } from './links/users/list/unit-user-list.component';
 import { UnitUserRolesFormComponent } from './links/users/roles/unit-user-roles.component';
@@ -73,6 +77,10 @@ export const unitsRoutingConfig: RoutingConfig = {
         paths: [`${listPath}/users`],
         paramsMapping,
       },
+      orgUnitCreateUser: {
+        paths: [`${listPath}/users/create`],
+        paramsMapping,
+      },
       unitUserRoles: {
         paths: [`${listPath}/users/:userCode/roles`],
         paramsMapping,
@@ -105,6 +113,10 @@ export const unitsRoutingConfig: RoutingConfig = {
         paths: [`${listPath}/cost-centers`],
         paramsMapping,
       },
+      orgUnitCreateCostCenter: {
+        paths: [`${listPath}/cost-centers/create`],
+        paramsMapping,
+      },
     },
   },
 };
@@ -186,6 +198,10 @@ export const unitsCmsConfig: CmsConfig = {
                   cxPageMeta: { breadcrumb: 'unit.breadcrumbs.users' },
                 },
                 children: [
+                  {
+                    path: 'create',
+                    component: UnitUserCreateComponent,
+                  },
                   {
                     path: `:${ROUTE_PARAMS.userCode}/roles`,
                     component: UnitUserRolesFormComponent,
@@ -195,6 +211,15 @@ export const unitsCmsConfig: CmsConfig = {
               {
                 path: 'cost-centers',
                 component: UnitCostCenterListComponent,
+                data: {
+                  cxPageMeta: { breadcrumb: 'unit.breadcrumbs.costCenters' },
+                },
+                children: [
+                  {
+                    path: 'create',
+                    component: UnitCostCenterCreateComponent,
+                  },
+                ],
               },
               {
                 path: 'addresses',
diff --git a/feature-libs/organization/administration/components/user/details/user-details.component.html b/feature-libs/organization/administration/components/user/details/user-details.component.html
index 4d616da6e66..0231939f00d 100644
--- a/feature-libs/organization/administration/components/user/details/user-details.component.html
+++ b/feature-libs/organization/administration/components/user/details/user-details.component.html
@@ -18,7 +18,7 @@
       </span>
     </div>
 
-    <div class="property">
+    <div class="property full-width">
       <label>{{ 'user.uid' | cxTranslate }}</label>
       <span class="value">
         {{ model.uid }}
@@ -50,7 +50,7 @@
         {{ model.orgUnit?.name }}
       </a>
     </div>
-    <div class="property">
+    <div class="property full-width">
       <a
         class="link"
         [class.disabled]="!model.active"
diff --git a/feature-libs/organization/administration/components/user/form/user-form.component.html b/feature-libs/organization/administration/components/user/form/user-form.component.html
index 937fdd93685..038d7b0d963 100644
--- a/feature-libs/organization/administration/components/user/form/user-form.component.html
+++ b/feature-libs/organization/administration/components/user/form/user-form.component.html
@@ -71,7 +71,7 @@
           type="checkbox"
           class="form-check-input"
           [value]="role"
-          [checked]="roles.value?.includes(role)"
+          [checked]="roles?.value?.includes(role)"
           (change)="updateRoles($event)"
         />
         <span class="form-check-label">
@@ -91,16 +91,12 @@
         [items]="units$ | async"
         bindLabel="name"
         bindValue="id"
-        [readonly]="form.get('orgUnit.uid').disabled"
         appendTo=".organization"
       >
       </ng-select>
     </label>
 
-    <label class="full-width">
-      <!-- <span class="label-content required">
-        {{ 'user.unitApprover' | cxTranslate }}
-      </span> -->
+    <label *ngIf="isAssignedToApprovers" class="full-width">
       <label class="form-check">
         <input
           type="checkbox"
diff --git a/feature-libs/organization/administration/components/user/form/user-form.component.ts b/feature-libs/organization/administration/components/user/form/user-form.component.ts
index 13248a70246..e72c38a4eea 100644
--- a/feature-libs/organization/administration/components/user/form/user-form.component.ts
+++ b/feature-libs/organization/administration/components/user/form/user-form.component.ts
@@ -1,4 +1,9 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { FormArray, FormControl, FormGroup } from '@angular/forms';
 import { B2BUser, B2BUserGroup, Title, UserService } from '@spartacus/core';
 import {
@@ -11,6 +16,7 @@ import { OrganizationItemService } from '../../shared/organization-item.service'
 import { UserItemService } from '../services/user-item.service';
 
 @Component({
+  selector: 'cx-user-form',
   templateUrl: './user-form.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [
@@ -23,6 +29,18 @@ import { UserItemService } from '../services/user-item.service';
 export class UserFormComponent implements OnInit {
   form: FormGroup = this.itemService.getForm();
 
+  /**
+   * Initialize the business unit for the user.
+   *
+   * If there's a unit provided, we disable the unit form control.
+   */
+  @Input() set unitKey(value: string) {
+    if (value) {
+      this.form?.get('orgUnit.uid').setValue(value);
+      this.form?.get('orgUnit')?.disable();
+    }
+  }
+
   units$: Observable<B2BUnitNode[]> = this.unitService.getActiveUnitList();
   titles$: Observable<Title[]> = this.userService.getTitles();
 
@@ -52,7 +70,7 @@ export class UserFormComponent implements OnInit {
     return this.form.get('roles') as FormArray;
   }
 
-  protected get isAssignedToApprovers(): FormControl {
+  get isAssignedToApprovers(): FormControl {
     return this.form.get('isAssignedToApprovers') as FormControl;
   }
 }
diff --git a/feature-libs/organization/administration/components/user/form/user-form.module.ts b/feature-libs/organization/administration/components/user/form/user-form.module.ts
index 53b8f64d599..8062c9479d6 100644
--- a/feature-libs/organization/administration/components/user/form/user-form.module.ts
+++ b/feature-libs/organization/administration/components/user/form/user-form.module.ts
@@ -20,5 +20,6 @@ import { UserFormComponent } from './user-form.component';
     FormErrorsModule,
   ],
   declarations: [UserFormComponent],
+  exports: [UserFormComponent],
 })
 export class UserFormModule {}
diff --git a/feature-libs/organization/administration/components/user/guards/active-user.guard.ts b/feature-libs/organization/administration/components/user/guards/active-user.guard.ts
index 09834e4307f..f28df48a2db 100644
--- a/feature-libs/organization/administration/components/user/guards/active-user.guard.ts
+++ b/feature-libs/organization/administration/components/user/guards/active-user.guard.ts
@@ -14,7 +14,7 @@ export class ActiveUserGuard extends ExistUserGuard {
   protected getRedirectUrl(_urlParams?: any): UrlTree {
     const urlPath = this.semanticPathService.transform({
       cxRoute: 'userDetails',
-      params: { code: _urlParams.code },
+      params: { customerId: _urlParams.code },
     });
 
     return this.router.parseUrl(urlPath.join('/'));
diff --git a/feature-libs/organization/administration/components/user/services/current-user.service.ts b/feature-libs/organization/administration/components/user/services/current-user.service.ts
index 025608a6e73..f0bb70ff17d 100644
--- a/feature-libs/organization/administration/components/user/services/current-user.service.ts
+++ b/feature-libs/organization/administration/components/user/services/current-user.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { B2BUser, CostCenter, RoutingService } from '@spartacus/core';
+import { B2BUser, RoutingService } from '@spartacus/core';
 import { B2BUserService } from '@spartacus/organization/administration/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -10,7 +10,7 @@ import { CurrentOrganizationItemService } from '../../shared/current-organizatio
   providedIn: 'root',
 })
 export class CurrentUserService extends CurrentOrganizationItemService<
-  CostCenter
+  B2BUser
 > {
   readonly name$: Observable<string> = this.item$.pipe(
     map((user: B2BUser) => user.name)
@@ -27,7 +27,7 @@ export class CurrentUserService extends CurrentOrganizationItemService<
     return ROUTE_PARAMS.userCode;
   }
 
-  protected getItem(code: string): Observable<CostCenter> {
+  protected getItem(code: string): Observable<B2BUser> {
     return this.b2bUserService.get(code);
   }
 }
diff --git a/feature-libs/organization/administration/components/user/services/user-item.service.ts b/feature-libs/organization/administration/components/user/services/user-item.service.ts
index 7fd50aaa5a6..3aa5115d4ad 100644
--- a/feature-libs/organization/administration/components/user/services/user-item.service.ts
+++ b/feature-libs/organization/administration/components/user/services/user-item.service.ts
@@ -3,7 +3,6 @@ import { B2BUser, RoutingService } from '@spartacus/core';
 import {
   B2BUserService,
   OrganizationItemStatus,
-  Permission,
 } from '@spartacus/organization/administration/core';
 import { Observable } from 'rxjs';
 import { OrganizationItemService } from '../../shared/organization-item.service';
@@ -13,7 +12,7 @@ import { CurrentUserService } from './current-user.service';
 @Injectable({
   providedIn: 'root',
 })
-export class UserItemService extends OrganizationItemService<Permission> {
+export class UserItemService extends OrganizationItemService<B2BUser> {
   constructor(
     protected currentItemService: CurrentUserService,
     protected routingService: RoutingService,
@@ -41,4 +40,11 @@ export class UserItemService extends OrganizationItemService<Permission> {
   protected getDetailsRoute(): string {
     return 'userDetails';
   }
+
+  // @override to avoid errors while creation
+  launchDetails(item: B2BUser): void {
+    if (item.customerId !== null) {
+      super.launchDetails(item);
+    }
+  }
 }
diff --git a/feature-libs/organization/administration/components/user/services/user-list.service.ts b/feature-libs/organization/administration/components/user/services/user-list.service.ts
index 926e3299ce1..ab0a1f1fc80 100644
--- a/feature-libs/organization/administration/components/user/services/user-list.service.ts
+++ b/feature-libs/organization/administration/components/user/services/user-list.service.ts
@@ -19,8 +19,8 @@ export interface UserModel {
 }
 
 /**
- * Service to populate Cost Center data to `Table` data. The cost center
- * data is driven by the table configuration, using the `OrganizationTables.COST_CENTER`.
+ * Service to populate User data to `Table` data. The user
+ * data is driven by the table configuration, using the `OrganizationTables.USER`.
  */
 @Injectable({
   providedIn: 'root',
diff --git a/feature-libs/organization/administration/core/store/effects/b2b-user.effect.ts b/feature-libs/organization/administration/core/store/effects/b2b-user.effect.ts
index 3ad8ca9aa72..ac4a3399d5a 100644
--- a/feature-libs/organization/administration/core/store/effects/b2b-user.effect.ts
+++ b/feature-libs/organization/administration/core/store/effects/b2b-user.effect.ts
@@ -9,6 +9,8 @@ import {
   mergeMap,
   groupBy,
   withLatestFrom,
+  tap,
+  take,
 } from 'rxjs/operators';
 import {
   B2BUser,
@@ -65,16 +67,27 @@ export class B2BUserEffects {
     switchMap((payload) =>
       this.b2bUserConnector.create(payload.userId, payload.orgCustomer).pipe(
         switchMap((data) => {
-          this.routingService.go({
-            cxRoute: 'userDetails',
-            params: { customerId: data.customerId },
-          });
-          return [
-            new B2BUserActions.CreateB2BUserSuccess(data),
-            new OrganizationActions.OrganizationClearData(),
-          ];
+          // TODO Workaround for not known customerId while user creation (redireciton)
+          return this.routingService.getRouterState().pipe(
+            take(1),
+            tap((route) => {
+              if (
+                (route as any)?.state?.context?.id !== '/organization/units'
+              ) {
+                this.routingService.go({
+                  cxRoute: 'userDetails',
+                  params: data,
+                });
+              }
+            }),
+            switchMap(() => {
+              return [
+                new B2BUserActions.CreateB2BUserSuccess(data),
+                new OrganizationActions.OrganizationClearData(),
+              ];
+            })
+          );
         }),
-
         catchError((error: HttpErrorResponse) =>
           from([
             new B2BUserActions.CreateB2BUserFail({
diff --git a/feature-libs/organization/administration/styles/_details.scss b/feature-libs/organization/administration/styles/_details.scss
index 48d3cb04085..c6b885e874c 100644
--- a/feature-libs/organization/administration/styles/_details.scss
+++ b/feature-libs/organization/administration/styles/_details.scss
@@ -14,6 +14,11 @@
       @include media-breakpoint-down(sm) {
         flex: 100%;
       }
+
+      &.full-width {
+        flex: 100%;
+      }
+
       margin-bottom: 30px;
     }
 
diff --git a/feature-libs/organization/administration/styles/_list.scss b/feature-libs/organization/administration/styles/_list.scss
index 0ae08a94703..7dda3ac5fe1 100644
--- a/feature-libs/organization/administration/styles/_list.scss
+++ b/feature-libs/organization/administration/styles/_list.scss
@@ -1,3 +1,9 @@
+@mixin is-current-active-selection {
+  outline: solid 3px var(--cx-color-primary);
+  outline-offset: -3px;
+  background: var(--cx-color-background-focus);
+}
+
 %ghost {
   &.ghost {
     .header {
@@ -280,6 +286,11 @@
                 padding-inline-start: 5px;
               }
             }
+            a {
+              &.is-current {
+                @include is-current-active-selection;
+              }
+            }
           }
           th:last-child,
           td:last-child {
@@ -300,9 +311,7 @@
         }
         // highlight current items
         &.is-current {
-          outline: solid 3px var(--cx-color-primary);
-          outline-offset: -3px;
-          background: var(--cx-color-background-focus);
+          @include is-current-active-selection;
         }
 
         &:focus-within {
diff --git a/feature-libs/organization/public_api.ts b/feature-libs/organization/public_api.ts
index 107b4e80533..8decc5e0e05 100644
--- a/feature-libs/organization/public_api.ts
+++ b/feature-libs/organization/public_api.ts
@@ -1,4 +1,4 @@
 /*
- * Public API Surface of organization
+ * Public API Surface of my-account
  */
 export * from '@spartacus/organization/administration';
diff --git a/projects/storefrontapp-e2e-cypress/cypress.ci.2005.json b/projects/storefrontapp-e2e-cypress/cypress.ci.2005.json
index ccfec186037..2202722d9ec 100644
--- a/projects/storefrontapp-e2e-cypress/cypress.ci.2005.json
+++ b/projects/storefrontapp-e2e-cypress/cypress.ci.2005.json
@@ -13,6 +13,8 @@
     "CLIENT_SECRET": "secret",
     "API_URL": "https://spartacus-dev0.eastus.cloudapp.azure.com:9002",
     "OCC_PREFIX": "/occ/v2",
+    "OCC_PREFIX_USER_ENDPOINT": "users",
+    "OCC_PREFIX_ORDER_ENDPOINT": "orders",
     "BASE_SITE": "electronics-spa",
     "B2B": false
   }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-replenishment-order-details.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-replenishment-order-details.ts
new file mode 100644
index 00000000000..8de7eb1b3b7
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-replenishment-order-details.ts
@@ -0,0 +1,147 @@
+import {
+  b2bProduct,
+  POWERTOOLS_BASESITE,
+} from '../../sample-data/b2b-checkout';
+import * as alerts from '../global-message';
+import { doPlaceOrder } from '../order-history';
+import {
+  replenishmentCancelDialogSelector,
+  replenishmentOrderHistorySelector,
+  visitReplenishmentHistory,
+} from './b2b-replenishment-order-history';
+
+export let replenishmentOrderDetailsUrl = (replenishmentOrderCode: string) =>
+  `/${POWERTOOLS_BASESITE}/en/USD/my-account/my-replenishment/${replenishmentOrderCode}`;
+
+export const orderOverviewSelector = 'cx-order-overview';
+export const cartListItemSelector = 'cx-cart-item-list';
+export const orderHistorySelector = 'cx-order-history';
+export const cancellationSelector = 'cx-replenishment-order-cancellation';
+
+export function createReplenishmentDetailsRequestRoute(
+  requestMethod: string,
+  replenishmentOrderCode: string,
+  alias: string
+) {
+  cy.server();
+
+  cy.route(
+    requestMethod,
+    `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
+      'BASE_SITE'
+    )}/users/*/replenishmentOrders/${replenishmentOrderCode}*`
+  ).as(alias);
+
+  return `@${alias}`;
+}
+
+export function clickReplenishmentDetails(replenishmentOrderCode: string) {
+  const replenishmentDetailsAlias = createReplenishmentDetailsRequestRoute(
+    'GET',
+    replenishmentOrderCode,
+    'replenishmentDetailsAlias'
+  );
+
+  cy.get(
+    `${replenishmentOrderHistorySelector} .cx-replenishment-order-history-code a`
+  )
+    .click()
+    .should('have.attr', 'href')
+    .and('eq', replenishmentOrderDetailsUrl(replenishmentOrderCode));
+
+  cy.wait(replenishmentDetailsAlias).its('status').should('eq', 200);
+
+  return replenishmentDetailsAlias;
+}
+
+export function cancelReplenishmentDetails() {
+  doPlaceOrder(b2bProduct).then((orderData: any) => {
+    cy.waitForOrderToBePlacedRequest(
+      POWERTOOLS_BASESITE,
+      undefined,
+      orderData.body.replenishmentOrderCode
+    );
+
+    visitReplenishmentHistory();
+
+    const replenishmentDetailsAlias = clickReplenishmentDetails(
+      orderData.body.replenishmentOrderCode
+    );
+
+    cy.get(replenishmentDetailsAlias).then((xhr) => {
+      const body = xhr.response.body;
+
+      expect(body.replenishmentOrderCode).to.eq(
+        orderData.body.replenishmentOrderCode
+      );
+
+      expect(body.active).to.equal(true);
+    });
+
+    verifyOrderOverviewIsNotCancelled();
+
+    cy.get(`${cartListItemSelector} .cx-link`).should(
+      'contain',
+      orderData.body.entries[0].product.name
+    );
+
+    cy.get(orderHistorySelector).should('exist');
+
+    cancellationButtons(2);
+
+    cy.get(cancellationSelector)
+      .contains('Cancel')
+      .should('be.visible')
+      .click();
+
+    verifyReplenishmentIsCancelled(orderData.body.replenishmentOrderCode);
+
+    cancellationButtons(1);
+
+    verifyOrderOverviewIsCancelled();
+  });
+}
+
+export function verifyOrderOverviewIsNotCancelled() {
+  cy.get(`${orderOverviewSelector} .cx-card-title`)
+    .parent()
+    .find('.cx-card-label')
+    .should('not.contain', 'Cancelled');
+}
+
+export function verifyOrderOverviewIsCancelled() {
+  cy.get(`${orderOverviewSelector} .cx-card-title`)
+    .parent()
+    .find('.cx-card-label')
+    .should('contain', 'Cancelled');
+}
+
+export function cancellationButtons(numberOfButton: number) {
+  cy.get(`${cancellationSelector} .cx-cancel-replenishment-btns`)
+    .children()
+    .should('have.length', numberOfButton);
+}
+
+export function verifyReplenishmentIsCancelled(replenishmentOrderCode: string) {
+  cy.server();
+
+  const cancelReplenishmentAlias = createReplenishmentDetailsRequestRoute(
+    'PATCH',
+    replenishmentOrderCode,
+    'cancelReplenishmentAlias'
+  );
+
+  cy.get(`${replenishmentCancelDialogSelector}`)
+    .should('exist')
+    .then((_) => {
+      cy.get(`${replenishmentCancelDialogSelector} .btn-primary`).click();
+    });
+
+  cy.wait(cancelReplenishmentAlias).its('status').should('eq', 200);
+
+  alerts
+    .getSuccessAlert()
+    .contains(
+      `Replenishment order #${replenishmentOrderCode} has been successfully cancelled`
+    );
+}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-replenishment-order-history.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-replenishment-order-history.ts
new file mode 100644
index 00000000000..e13e0bad8f8
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-replenishment-order-history.ts
@@ -0,0 +1,136 @@
+import {
+  b2bProduct,
+  POWERTOOLS_BASESITE,
+} from '../../sample-data/b2b-checkout';
+import { doPlaceOrder } from '../order-history';
+import { verifyReplenishmentIsCancelled } from './b2b-replenishment-order-details';
+
+export const replenishmentOrderHistoryUrl = `${POWERTOOLS_BASESITE}/en/USD/my-account/my-replenishments`;
+export const replenishmentCancelDialogSelector =
+  'cx-replenishment-order-cancellation-dialog';
+export const replenishmentOrderHistorySelector =
+  'cx-replenishment-order-history';
+export const replenishmentOrderHistoryHeaderValue =
+  'Replenishment Order History';
+
+export function createReplenishmentRequestRoute(requestMethod: string) {
+  const replenishmentAlias = 'replenishmentAlias';
+
+  cy.server();
+
+  cy.route(
+    requestMethod,
+    `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
+      'BASE_SITE'
+    )}/users/*/replenishmentOrders*`
+  ).as(replenishmentAlias);
+
+  return `@${replenishmentAlias}`;
+}
+
+export function visitReplenishmentHistory() {
+  const replenishmentHistoryAlias = createReplenishmentRequestRoute('GET');
+
+  cy.visit(replenishmentOrderHistoryUrl);
+  cy.wait(replenishmentHistoryAlias).its('status').should('eq', 200);
+
+  return replenishmentHistoryAlias;
+}
+
+export function waitForReplenishmentOrders() {
+  doPlaceOrder(b2bProduct).then(() => {
+    doPlaceOrder(b2bProduct).then((orderData: any) => {
+      cy.waitForOrderToBePlacedRequest(
+        POWERTOOLS_BASESITE,
+        undefined,
+        orderData.body.replenishmentOrderCode
+      );
+
+      const replenishmentHistoryAlias = visitReplenishmentHistory();
+
+      cy.get(replenishmentHistoryAlias).should((xhr) => {
+        const body = xhr.response.body;
+
+        expect(body.replenishmentOrders).to.have.length(2);
+
+        body.replenishmentOrders.forEach((replenishmentOrder) => {
+          expect(replenishmentOrder.active).to.equal(true);
+        });
+      });
+
+      cy.get(
+        `${replenishmentOrderHistorySelector} .cx-replenishment-order-history-header h3`
+      ).should('contain', replenishmentOrderHistoryHeaderValue);
+      cy.get(
+        `${replenishmentOrderHistorySelector} .cx-replenishment-order-history-code > .cx-replenishment-order-history-value`
+      ).should('contain', orderData.body.replenishmentOrderCode);
+      cy.get(
+        `${replenishmentOrderHistorySelector} .cx-replenishment-order-history-total > .cx-replenishment-order-history-value`
+      ).should('contain', orderData.body.totalPriceWithTax.formattedValue);
+    });
+  });
+}
+
+export function verifySorting() {
+  visitReplenishmentHistory();
+
+  cy.server();
+  cy.route('GET', /sort=byReplenishmentNumber/).as('query_order_asc');
+
+  cy.get('.top cx-sorting .ng-select').ngSelect('Replenishment Number');
+
+  cy.wait('@query_order_asc').its('status').should('eq', 200);
+
+  cy.get(
+    `${replenishmentOrderHistorySelector} .cx-replenishment-order-history-code > .cx-replenishment-order-history-value`
+  ).then(($orders) => {
+    expect(
+      $orders[0].textContent
+        .toString()
+        .localeCompare($orders[1].textContent.toString())
+    ).to.equal(-1);
+  });
+}
+
+export function cancelReplenishmentInHistory() {
+  const replenishmentHistoryAlias = visitReplenishmentHistory();
+
+  cy.get(replenishmentHistoryAlias).should((xhr) => {
+    const body = xhr.response.body;
+    expect(body.replenishmentOrders[0].active).to.equal(true);
+
+    verifyFirstRowReplenishmentIsNotCancelled();
+
+    cy.get(
+      `${replenishmentOrderHistorySelector} .cx-replenishment-order-history-cancel:first button`
+    )
+      .should('exist')
+      .click();
+
+    verifyReplenishmentIsCancelled(
+      body.replenishmentOrders[0].replenishmentOrderCode
+    );
+
+    verifyFirstRowReplenishmentIsCancelled();
+
+    cy.get(
+      `${replenishmentOrderHistorySelector} tr:first .cx-replenishment-order-history-cancel button`
+    ).should('not.exist');
+  });
+}
+
+export function verifyFirstRowReplenishmentIsCancelled() {
+  cy.get(
+    `${replenishmentOrderHistorySelector} tr:first .cx-replenishment-order-history-value`
+  )
+    .eq(4)
+    .should('contain', 'Cancelled');
+}
+
+export function verifyFirstRowReplenishmentIsNotCancelled() {
+  cy.get(
+    `${replenishmentOrderHistorySelector} tr:first .cx-replenishment-order-history-value`
+  )
+    .eq(4)
+    .should('not.contain', 'Cancelled');
+}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/homepage.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/homepage.ts
index b4df920e2af..775078902e3 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/homepage.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/homepage.ts
@@ -1,7 +1,5 @@
 export function checkBanner() {
-  cy.get(
-    'cx-page-slot cx-banner img[alt="Save Big On Select SLR & DSLR Cameras"]'
-  ).should('exist');
+  cy.get('cx-page-slot cx-banner img').should('exist');
 }
 
 export function clickHamburger() {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/order-history.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/order-history.ts
index 37133efc05a..4bd45267e01 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/order-history.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/order-history.ts
@@ -1,11 +1,16 @@
-import { user } from '../sample-data/checkout-flow';
+import { SampleUser, user } from '../sample-data/checkout-flow';
 import { login } from './auth-forms';
+import {
+  replenishmentOrderHistoryHeaderValue,
+  replenishmentOrderHistoryUrl,
+} from './b2b/b2b-replenishment-order-history';
+import { waitForPage } from './checkout-flow';
 import { checkBanner } from './homepage';
 import { switchLanguage } from './language';
 
 const orderHistoryLink = '/my-account/orders';
 
-export function doPlaceOrder() {
+export function doPlaceOrder(productData?: any) {
   let stateAuth: any;
 
   return cy
@@ -13,7 +18,7 @@ export function doPlaceOrder() {
     .then((win) => JSON.parse(win.localStorage.getItem('spartacus-local-data')))
     .then(({ auth }) => {
       stateAuth = auth;
-      return cy.requireProductAddedToCart(stateAuth);
+      return cy.requireProductAddedToCart(stateAuth, productData);
     })
     .then(({ cartId }) => {
       cy.requireShippingAddressAdded(user.address, stateAuth);
@@ -26,26 +31,42 @@ export function doPlaceOrder() {
 
 export const orderHistoryTest = {
   // no orders flow
-  checkRedirectNotLoggedInUser() {
+  checkRedirectNotLoggedInUser(url: string = orderHistoryLink) {
     it('should redirect to login page if user is not logged in', () => {
-      cy.visit(orderHistoryLink);
+      cy.visit(url);
       cy.url().should('contain', '/login');
       cy.get('cx-login').should('contain', 'Sign In / Register');
     });
   },
-  checkRedirectLoggedInUser() {
+  checkRedirectLoggedInUser(
+    sampleUser: SampleUser = user,
+    url: string = orderHistoryLink
+  ) {
     it('should go to Order History once user has logged in', () => {
-      login(user.email, user.password);
-      cy.url().should('contain', orderHistoryLink);
-      cy.get('.cx-order-history-header h3').should('contain', 'Order history');
+      login(sampleUser.email, sampleUser.password);
+      cy.url().should('contain', url);
+      if (url === replenishmentOrderHistoryUrl) {
+        cy.get('.cx-replenishment-order-history-header h3').should(
+          'contain',
+          replenishmentOrderHistoryHeaderValue
+        );
+      } else {
+        cy.get('.cx-order-history-header h3').should(
+          'contain',
+          'Order history'
+        );
+      }
     });
   },
   checkStartShoppingButton() {
     it('should be able to start shopping from an empty Order History', () => {
+      const homePage = waitForPage('homepage', 'getHomePage');
+
       cy.get('.btn.btn-primary.btn-block.active')
         .findByText('Start Shopping')
         .click();
 
+      cy.wait(`@${homePage}`).its('status').should('eq', 200);
       checkBanner();
     });
   },
diff --git a/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/accessibility/tabbing-order.e2e-spec.ts b/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/accessibility/tabbing-order.e2e-spec.ts
index b9939297778..ac4184cae55 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/accessibility/tabbing-order.e2e-spec.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/accessibility/tabbing-order.e2e-spec.ts
@@ -14,20 +14,24 @@ import {
   checkoutShippingAddressExistingTabbingOrder,
   checkoutShippingAddressNewTabbingOrder,
 } from '../../../helpers/accessibility/tabbing-order/checkout/shipping-address';
-import { generateMail, randomString } from '../../../helpers/user';
-import { b2bUser } from '../../../sample-data/b2b-checkout';
+import { loginB2bUser } from '../../../helpers/b2b/b2b-checkout';
+import { b2bProduct } from '../../../sample-data/b2b-checkout';
 
 describe('Tabbing order for B2B checkout', () => {
   describe('Checkout Credit Card', () => {
     before(() => {
-      b2bUser.registrationData.email = generateMail(randomString(), true);
-      cy.requireLoggedIn(b2bUser);
+      cy.window().then((win) => {
+        win.localStorage.clear();
+        win.sessionStorage.clear();
+      });
+
+      loginB2bUser();
 
       cy.window()
         .then((win) =>
           JSON.parse(win.localStorage.getItem('spartacus-local-data'))
         )
-        .then(({ auth }) => cy.requireProductAddedToCart(auth));
+        .then(({ auth }) => cy.requireProductAddedToCart(auth, b2bProduct));
     });
 
     beforeEach(() => {
@@ -82,18 +86,18 @@ describe('Tabbing order for B2B checkout', () => {
 
   describe('Checkout Account', () => {
     before(() => {
-      cy.restoreLocalStorage();
       cy.window().then((win) => {
-        const { auth } = JSON.parse(
-          win.localStorage.getItem('spartacus-local-data')
-        );
-        const cartCode = JSON.parse(
-          window.localStorage.getItem('spartacus⚿powertools-spa⚿cart')
-        ).active;
-
-        cy.requireProductAddedToCart(auth, cartCode);
+        win.localStorage.clear();
+        win.sessionStorage.clear();
       });
-      cy.saveLocalStorage();
+
+      loginB2bUser();
+
+      cy.window()
+        .then((win) =>
+          JSON.parse(win.localStorage.getItem('spartacus-local-data'))
+        )
+        .then(({ auth }) => cy.requireProductAddedToCart(auth, b2bProduct));
     });
 
     beforeEach(() => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/my-account/b2b-replenishment-order-details-flow.e2e-spec.ts b/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/my-account/b2b-replenishment-order-details-flow.e2e-spec.ts
new file mode 100644
index 00000000000..56bb9e644fa
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/my-account/b2b-replenishment-order-details-flow.e2e-spec.ts
@@ -0,0 +1,24 @@
+import { loginB2bUser } from '../../../helpers/b2b/b2b-checkout';
+import * as replenishmentDetails from '../../../helpers/b2b/b2b-replenishment-order-details';
+import {
+  ORDER_REQUEST_ENDPOINT,
+  POWERTOOLS_BASESITE,
+  USER_REQUEST_ENDPOINT,
+} from '../../../sample-data/b2b-checkout';
+
+describe('Replenishment order details', () => {
+  before(() => {
+    cy.window().then((win) => win.sessionStorage.clear());
+    Cypress.env('BASE_SITE', POWERTOOLS_BASESITE);
+    Cypress.env('OCC_PREFIX_USER_ENDPOINT', USER_REQUEST_ENDPOINT);
+    Cypress.env('OCC_PREFIX_ORDER_ENDPOINT', ORDER_REQUEST_ENDPOINT);
+  });
+
+  it('should be able to login as a b2b user', () => {
+    loginB2bUser();
+  });
+
+  it('should be able to cancel a replenishment order details', () => {
+    replenishmentDetails.cancelReplenishmentDetails();
+  });
+});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/my-account/b2b-replenishment-order-history-no-orders-flow.e2e-spec.ts b/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/my-account/b2b-replenishment-order-history-no-orders-flow.e2e-spec.ts
new file mode 100644
index 00000000000..eb69d4f42b0
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/my-account/b2b-replenishment-order-history-no-orders-flow.e2e-spec.ts
@@ -0,0 +1,24 @@
+import { replenishmentOrderHistoryUrl } from '../../../helpers/b2b/b2b-replenishment-order-history';
+import { orderHistoryTest } from '../../../helpers/order-history';
+import {
+  b2bAccountShipToUser,
+  ORDER_REQUEST_ENDPOINT,
+  POWERTOOLS_BASESITE,
+  USER_REQUEST_ENDPOINT,
+} from '../../../sample-data/b2b-checkout';
+
+describe('Order History with no orders', () => {
+  before(() => {
+    cy.window().then((win) => win.sessionStorage.clear());
+    Cypress.env('BASE_SITE', POWERTOOLS_BASESITE);
+    Cypress.env('OCC_PREFIX_USER_ENDPOINT', USER_REQUEST_ENDPOINT);
+    Cypress.env('OCC_PREFIX_ORDER_ENDPOINT', ORDER_REQUEST_ENDPOINT);
+  });
+
+  orderHistoryTest.checkRedirectNotLoggedInUser(replenishmentOrderHistoryUrl);
+  orderHistoryTest.checkRedirectLoggedInUser(
+    b2bAccountShipToUser,
+    replenishmentOrderHistoryUrl
+  );
+  orderHistoryTest.checkStartShoppingButton();
+});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/my-account/b2b-replenishment-order-history-orders-flow.e2e-spec.ts b/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/my-account/b2b-replenishment-order-history-orders-flow.e2e-spec.ts
new file mode 100644
index 00000000000..bf7319edc7a
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/integration/b2b/my-account/b2b-replenishment-order-history-orders-flow.e2e-spec.ts
@@ -0,0 +1,40 @@
+import { loginB2bUser } from '../../../helpers/b2b/b2b-checkout';
+import * as replenishmentHistory from '../../../helpers/b2b/b2b-replenishment-order-history';
+import {
+  ORDER_REQUEST_ENDPOINT,
+  POWERTOOLS_BASESITE,
+  USER_REQUEST_ENDPOINT,
+} from '../../../sample-data/b2b-checkout';
+
+describe('Replenishment order history', () => {
+  before(() => {
+    cy.window().then((win) => win.sessionStorage.clear());
+    Cypress.env('BASE_SITE', POWERTOOLS_BASESITE);
+    Cypress.env('OCC_PREFIX_USER_ENDPOINT', USER_REQUEST_ENDPOINT);
+    Cypress.env('OCC_PREFIX_ORDER_ENDPOINT', ORDER_REQUEST_ENDPOINT);
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+
+  it('should be able to login as a b2b user', () => {
+    loginB2bUser();
+  });
+
+  it('should be able to view order in replenishment order history', () => {
+    replenishmentHistory.waitForReplenishmentOrders();
+  });
+
+  it('should be able to sort ', () => {
+    replenishmentHistory.verifySorting();
+  });
+
+  it('should be able to cancel a replenishment', () => {
+    replenishmentHistory.cancelReplenishmentInHistory();
+  });
+});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/sample-data/b2b-checkout.ts b/projects/storefrontapp-e2e-cypress/cypress/sample-data/b2b-checkout.ts
index 1f066e22622..08a6c27447b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/sample-data/b2b-checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/sample-data/b2b-checkout.ts
@@ -8,6 +8,8 @@ import {
 
 export const POWERTOOLS_BASESITE = 'powertools-spa';
 export const POWERTOOLS_DEFAULT_DELIVERY_MODE = 'deliveryMode-standard-net';
+export const USER_REQUEST_ENDPOINT = 'orgUsers';
+export const ORDER_REQUEST_ENDPOINT = 'replenishmentOrders';
 export const poNumber = '123';
 export const costCenter = 'PunchOut Organization';
 export const b2bUnit = 'PunchOut Organization';
@@ -27,6 +29,8 @@ export const cartWithB2bProduct: SampleCartProduct = {
 };
 
 export const b2bAccountShipToUser: SampleUser = {
+  email: 'powertools-test-user-with-orders@ydev.hybris.com',
+  password: 'Password123.',
   fullName: 'PunchOut Customer',
   address: {
     city: 'Chicago',
@@ -57,15 +61,15 @@ export const recurrencePeriod = {
   WEEKLY: 'WEEKLY',
 };
 
-export const DaysOfWeek = {
-  MONDAY: 'MONDAY',
-  TUESDAY: 'TUESDAY',
-  WEDNESDAY: 'WEDNESDAY',
-  THURSDAY: 'THURSDAY',
-  FRIDAY: 'FRIDAY',
-  SATURDAY: 'SATURDAY',
-  SUNDAY: 'SUNDAY',
-};
+export enum DaysOfWeek {
+  MONDAY = 'MONDAY',
+  TUESDAY = 'TUESDAY',
+  WEDNESDAY = 'WEDNESDAY',
+  THURSDAY = 'THURSDAY',
+  FRIDAY = 'FRIDAY',
+  SATURDAY = 'SATURDAY',
+  SUNDAY = 'SUNDAY',
+}
 
 export const recurrencePeriodMap = new Map<string, string>([
   [recurrencePeriod.DAILY, 'days'],
diff --git a/projects/storefrontapp-e2e-cypress/cypress/support/require-placed-order.commands.ts b/projects/storefrontapp-e2e-cypress/cypress/support/require-placed-order.commands.ts
index 9d2270ec081..9412f0bb480 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/support/require-placed-order.commands.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/support/require-placed-order.commands.ts
@@ -1,3 +1,5 @@
+import { DaysOfWeek, recurrencePeriod } from '../sample-data/b2b-checkout';
+
 declare namespace Cypress {
   interface Chainable {
     /**
@@ -20,11 +22,25 @@ Cypress.Commands.add('requirePlacedOrder', (auth, cartId) => {
       method: 'POST',
       url: `${Cypress.env('API_URL')}/${Cypress.env(
         'OCC_PREFIX'
-      )}/${Cypress.env('BASE_SITE')}/users/current/orders?cartId=${cartId}`,
+      )}/${Cypress.env('BASE_SITE')}/${Cypress.env(
+        'OCC_PREFIX_USER_ENDPOINT'
+      )}/current/${Cypress.env(
+        'OCC_PREFIX_ORDER_ENDPOINT'
+      )}?cartId=${cartId}&termsChecked=true`,
       form: false,
       headers: {
         Authorization: `bearer ${auth.userToken.token.access_token}`,
       },
+      body: Cypress.env('OCC_PREFIX_USER_ENDPOINT')
+        ? {
+            daysOfWeek: [DaysOfWeek.MONDAY],
+            nthDayOfMonth: '1',
+            numberOfDays: '14',
+            numberOfWeeks: '1',
+            recurrencePeriod: recurrencePeriod.DAILY,
+            replenishmentStartDate: '2020-10-08T07:52:23Z',
+          }
+        : {},
     });
   }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/support/require-product-added-to-cart.commands.ts b/projects/storefrontapp-e2e-cypress/cypress/support/require-product-added-to-cart.commands.ts
index cab06587669..0be60851595 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/support/require-product-added-to-cart.commands.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/support/require-product-added-to-cart.commands.ts
@@ -1,13 +1,5 @@
-import { b2bProduct } from '../sample-data/b2b-checkout';
 import { product } from '../sample-data/checkout-flow';
 
-const cartsUrl = `${Cypress.env('API_URL')}/${Cypress.env(
-  'OCC_PREFIX'
-)}/${Cypress.env('BASE_SITE')}/users/current/carts`;
-const b2bCartsUrl = `${Cypress.env('API_URL')}/${Cypress.env(
-  'OCC_PREFIX'
-)}/${Cypress.env('BASE_SITE')}/orgUsers/current/carts`;
-
 declare global {
   namespace Cypress {
     interface Chainable {
@@ -23,7 +15,7 @@ declare global {
        */
       requireProductAddedToCart: (
         auth: {},
-        cartCode?: string
+        productData?: {}
       ) => Cypress.Chainable<any>;
     }
   }
@@ -31,11 +23,13 @@ declare global {
 
 Cypress.Commands.add(
   'requireProductAddedToCart',
-  (auth: any, code?: string) => {
+  (auth, productData = product) => {
     function createCart() {
       return cy.request({
         method: 'POST',
-        url: cartsUrl,
+        url: `${Cypress.env('API_URL')}/${Cypress.env(
+          'OCC_PREFIX'
+        )}/${Cypress.env('BASE_SITE')}/users/current/carts`,
         body: {
           fields: 'DEFAULT',
         },
@@ -47,13 +41,13 @@ Cypress.Commands.add(
     }
 
     function addToCart(cartCode: any, productData: any) {
-      const url = Boolean(Cypress.env('B2B'))
-        ? `${b2bCartsUrl}/${cartCode}/entries/`
-        : `${cartsUrl}/${cartCode}/entries`;
-
       return cy.request({
         method: 'POST',
-        url: url,
+        url: `${Cypress.env('API_URL')}/${Cypress.env(
+          'OCC_PREFIX'
+        )}/${Cypress.env('BASE_SITE')}/${Cypress.env(
+          'OCC_PREFIX_USER_ENDPOINT'
+        )}/current/carts/${cartCode}/entries`,
         body: {
           code: productData.code,
           qty: 1,
@@ -67,20 +61,11 @@ Cypress.Commands.add(
 
     cy.server();
 
-    if (!Boolean(code)) {
-      createCart().then((cart) => {
-        const prod = Boolean(Cypress.env('B2B')) ? b2bProduct : product;
-        addToCart(cart.body.code, prod).then((resp) => {
-          resp.body.cartId = cart.body.code; // need this in the response for later use
-          cy.wrap(resp.body);
-        });
-      });
-    } else {
-      const prod = Boolean(Cypress.env('B2B')) ? b2bProduct : product;
-      addToCart(code, prod).then((resp) => {
-        resp.body.cartId = code; // need this in the response for later use
+    createCart().then((cart) => {
+      addToCart(cart.body.code, productData).then((resp) => {
+        resp.body.cartId = cart.body.code; // need this in the response for later use
         cy.wrap(resp.body);
       });
-    }
+    });
   }
 );
diff --git a/projects/storefrontapp-e2e-cypress/cypress/support/utils/order-placed.ts b/projects/storefrontapp-e2e-cypress/cypress/support/utils/order-placed.ts
index ee0c8c5a00f..530612abc76 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/support/utils/order-placed.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/support/utils/order-placed.ts
@@ -25,7 +25,9 @@ export function waitForOrderToBePlacedRequest(
     method: 'GET',
     url: `${Cypress.env('API_URL')}${Cypress.env(
       'OCC_PREFIX'
-    )}/${contentCatalog}/users/${userId}/orders?pageSize=5&lang=en&curr=${currency}`,
+    )}/${contentCatalog}/users/${userId}/${Cypress.env(
+      'OCC_PREFIX_ORDER_ENDPOINT'
+    )}?pageSize=5&lang=en&curr=${currency}`,
     headers: {
       Authorization: `bearer ${access_token}`,
     },
@@ -41,7 +43,14 @@ export function waitForOrderToBePlacedRequest(
           res.body.orders.length &&
           (!orderNumber ||
             res.body.orders.filter((order) => order.code === orderNumber)
-              .length > 0))
+              .length > 0)) ||
+        (res.status === 200 &&
+          res.body.replenishmentOrders &&
+          res.body.replenishmentOrders.length &&
+          (!orderNumber ||
+            res.body.replenishmentOrders.filter(
+              (order) => order.replenishmentOrderCode === orderNumber
+            ).length > 0))
       ) {
         startTime = 0;
         return;
diff --git a/projects/storefrontapp-e2e-cypress/package.json b/projects/storefrontapp-e2e-cypress/package.json
index ec933b50dda..f315e7b0231 100644
--- a/projects/storefrontapp-e2e-cypress/package.json
+++ b/projects/storefrontapp-e2e-cypress/package.json
@@ -19,9 +19,9 @@
     "cy:run:smoke:ci:1905": "cypress run --config-file cypress.ci.1905.json --record --key $CYPRESS_KEY --tag \"1905,smoke\" --spec \"cypress/integration/smoke/**/*\"",
     "cy:run:smoke:ci:2005": "cypress run --config-file cypress.ci.2005.json --record --key $CYPRESS_KEY --tag \"2005,smoke\" --spec \"cypress/integration/smoke/**/*\"",
     "cy:run:smoke:ci:ccv2": "cypress run --config-file cypress.ci.ccv2.json --record --key $CYPRESS_KEY --tag \"ccv2,smoke\" --spec \"cypress/integration/smoke/**/*\"",
-    "cy:run:b2b": "cypress run --config-file cypress.ci.2005.json --env BASE_SITE=powertools-spa,B2B=true --spec \"cypress/integration/b2b/**/*\"",
-    "cy:run:b2b:ci": "cypress run --config-file cypress.ci.2005.json --env BASE_SITE=powertools-spa,B2B=true --record --key $CYPRESS_KEY --tag \"2005,b2b\" --spec \"cypress/integration/b2b/**/*\"",
-    "cy:open:b2b": "cypress open --config-file cypress.ci.2005.json --env BASE_SITE=powertools-spa,B2B=true --config testFiles=**/b2b/**/*"
+    "cy:run:b2b": "cypress run --config-file cypress.ci.2005.json --env BASE_SITE=powertools-spa,B2B=true,OCC_PREFIX_USER_ENDPOINT=orgUsers --spec \"cypress/integration/b2b/**/*\"",
+    "cy:run:b2b:ci": "cypress run --config-file cypress.ci.2005.json --env BASE_SITE=powertools-spa,B2B=true,OCC_PREFIX_USER_ENDPOINT=orgUsers --record --key $CYPRESS_KEY --tag \"2005,b2b\" --spec \"cypress/integration/b2b/**/*\"",
+    "cy:open:b2b": "cypress open --config-file cypress.ci.2005.json --env BASE_SITE=powertools-spa,B2B=true,OCC_PREFIX_USER_ENDPOINT=orgUsers --config testFiles=**/b2b/**/*"
   },
   "devDependencies": {
     "@cypress/webpack-preprocessor": "^5.4.6",
diff --git a/projects/storefrontstyles/scss/components/content/navigation/_breadcrumb.scss b/projects/storefrontstyles/scss/components/content/navigation/_breadcrumb.scss
index 1c688e5d852..3d2975756d1 100644
--- a/projects/storefrontstyles/scss/components/content/navigation/_breadcrumb.scss
+++ b/projects/storefrontstyles/scss/components/content/navigation/_breadcrumb.scss
@@ -35,6 +35,7 @@ html[dir='rtl'] cx-breadcrumb nav span:not(:last-child):after {
         content: '/';
       }
       a {
+        text-transform: capitalize;
         color: inherit;
         padding: 5px 5px;
       }