diff --git a/e2e/cypress/e2e/specs/extras/punchout-management.b2b.e2e-spec.ts b/e2e/cypress/e2e/specs/extras/punchout-management.b2b.e2e-spec.ts
index afdc54bce9..323a0a0010 100644
--- a/e2e/cypress/e2e/specs/extras/punchout-management.b2b.e2e-spec.ts
+++ b/e2e/cypress/e2e/specs/extras/punchout-management.b2b.e2e-spec.ts
@@ -74,6 +74,7 @@ describe('Punchout MyAccount Functionality', () => {
       page.submit();
     });
     at(PunchoutOverviewPage, page => {
+      page.selectOciTab();
       page.userList.should('contain', `${_.punchoutUser2.login}`);
       page.userList.should('not.contain', `Inactive`);
       page.successMessage.message.should('contain', 'created');
diff --git a/src/app/extensions/punchout/pages/account-punchout/account-punchout-page.component.html b/src/app/extensions/punchout/pages/account-punchout/account-punchout-page.component.html
index 827b36da0f..d8cd033752 100644
--- a/src/app/extensions/punchout/pages/account-punchout/account-punchout-page.component.html
+++ b/src/app/extensions/punchout/pages/account-punchout/account-punchout-page.component.html
@@ -8,7 +8,8 @@
   <h2 class="mt-1">
     {{ 'account.punchout.user.list.heading' | translate : { '0': selectedType } }}
     <a
-      [routerLink]="['/account/punchout/create', { format: selectedType }]"
+      [routerLink]="['/account/punchout/create']"
+      [queryParams]="{ format: selectedType }"
       class="btn btn-secondary"
       data-testing-id="add-user-button"
     >