diff --git a/prime-angular-frontend/src/app/modules/enrolment/enrolment-routing.module.ts b/prime-angular-frontend/src/app/modules/enrolment/enrolment-routing.module.ts
index 6731e2c7aa..1dd894257a 100644
--- a/prime-angular-frontend/src/app/modules/enrolment/enrolment-routing.module.ts
+++ b/prime-angular-frontend/src/app/modules/enrolment/enrolment-routing.module.ts
@@ -34,7 +34,6 @@ import { RemoteAccessComponent } from './pages/remote-access/remote-access.compo
 import { RemoteAccessAddressesComponent } from './pages/remote-access-addresses/remote-access-addresses.component';
 import { PaperEnrolleeReturneesPageComponent } from './pages/paper-enrollee-returnees-page/paper-enrollee-returnees-page.component';
 import { AbsenceManagementPageComponent } from './pages/absence-management-page/absence-management-page.component';
-import { NextStepsComponent } from './pages/next-steps/next-steps.component';
 
 const routes: Routes = [
   {
@@ -173,7 +172,7 @@ const routes: Routes = [
       },
       {
         path: EnrolmentRoutes.NEXT_STEPS,
-        component: NextStepsComponent,
+        component: PharmanetEnrolmentSummaryComponent,
         data: { title: 'Next Steps' }
       },
       //
diff --git a/prime-angular-frontend/src/app/modules/enrolment/enrolment.module.ts b/prime-angular-frontend/src/app/modules/enrolment/enrolment.module.ts
index 554ecf94c0..835e41c216 100644
--- a/prime-angular-frontend/src/app/modules/enrolment/enrolment.module.ts
+++ b/prime-angular-frontend/src/app/modules/enrolment/enrolment.module.ts
@@ -37,7 +37,6 @@ import { HeaderComponent } from './shared/components/header/header.component';
 import { EnrolmentProgressIndicatorComponent } from './shared/components/enrolment-progress-indicator/enrolment-progress-indicator.component';
 import { PaperEnrolleeReturneesPageComponent } from './pages/paper-enrollee-returnees-page/paper-enrollee-returnees-page.component';
 import { AbsenceManagementPageComponent } from './pages/absence-management-page/absence-management-page.component';
-import { NextStepsComponent } from './pages/next-steps/next-steps.component';
 
 @NgModule({
   declarations: [
@@ -70,7 +69,6 @@ import { NextStepsComponent } from './pages/next-steps/next-steps.component';
     RemoteAccessAddressesComponent,
     PaperEnrolleeReturneesPageComponent,
     AbsenceManagementPageComponent,
-    NextStepsComponent,
   ],
   imports: [
     SharedModule,
diff --git a/prime-angular-frontend/src/app/modules/enrolment/pages/access-agreement/access-agreement.component.ts b/prime-angular-frontend/src/app/modules/enrolment/pages/access-agreement/access-agreement.component.ts
index 8e06496274..93c088254a 100644
--- a/prime-angular-frontend/src/app/modules/enrolment/pages/access-agreement/access-agreement.component.ts
+++ b/prime-angular-frontend/src/app/modules/enrolment/pages/access-agreement/access-agreement.component.ts
@@ -114,7 +114,7 @@ export class AccessAgreementComponent extends BaseEnrolmentPage implements OnIni
         .subscribe(() => {
           this.toastService.openSuccessToast(`Terms of Access has been ${status.adjective}`);
           this.router.navigate([EnrolmentRoutes.NEXT_STEPS],
-            { relativeTo: this.route.parent, queryParams: { initialEnrolment: this.isInitialEnrolment } });
+            { relativeTo: this.route.parent, queryParams: { initialEnrolment: this.isInitialEnrolment, complete: false } });
         });
     }
   }
diff --git a/prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.html b/prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.html
deleted file mode 100644
index e56df94d53..0000000000
--- a/prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<div class="app-print-layout">
-
-  <app-enrollee-page [busy]="busy">
-
-    <app-page-header>
-      {{ title }}
-    </app-page-header>
-
-    <app-enrolment-progress-indicator *ngIf="initialEnrolment"
-                                      [inProgress]="initialEnrolment"
-                                      [isCentered]="true"></app-enrolment-progress-indicator>
-
-    <div class="row">
-      <ng-container *ngIf="initialEnrolment; else renewalConfirmation">
-        <div *ngIf="!complete"
-             imageName="notification"
-             class="col-12">
-          <app-page-subheader [divider]="false">
-            <ng-container appPageSubheaderTitle>Share your approval with your PharmaNet administrator</ng-container>
-            <ng-container appPageSubheaderSummary>
-              PRIME will send your enrolment information to your PharmaNet administrator(s) so they can set up your
-              access.
-              <div class="font-italic"
-                   *ngIf="enrolment.currentStatus.statusCode === EnrolmentStatus.EDITABLE">
-                Note: You cannot access PharmaNet without completing this step. If necessary, you can leave this blank
-                and
-                return to PRIME later to enter the email(s).
-              </div>
-            </ng-container>
-          </app-page-subheader>
-        </div>
-      </ng-container>
-
-      <ng-container *ngFor="let careSettingConfig of careSettingConfigs">
-        <div class="col-12 mb-4">
-          <ng-container [ngTemplateOutlet]="settingEmail"
-                        [ngTemplateOutletContext]="careSettingConfig">
-          </ng-container>
-        </div>
-      </ng-container>
-
-      <div *ngIf="careSettingConfigs.length > 0"
-           class="col col-sm-12 pt-2 text-right">
-        <button mat-flat-button
-                type="button"
-                color="primary"
-                (click)="sendProvisionerAccessLinkTo()">
-          Send Email
-        </button>
-      </div>
-
-      <ng-template #settingEmail
-                   let-setting="setting"
-                   let-settingPlural="settingPlural"
-                   let-settingCode="settingCode"
-                   let-healthAuthorityCode="healthAuthorityCode"
-                   let-formArray="formArray"
-                   let-formArrayName="formArrayName"
-                   let-subheaderContent="subheaderContent">
-        <app-page-subheader [divider]="false">
-          <ng-container appPageSubheaderTitle>{{ setting }}</ng-container>
-          <ng-container appPageSubheaderSummary>
-            {{ subheaderContent }}
-          </ng-container>
-        </app-page-subheader>
-
-        <form [formGroup]="emailForm">
-          <div class="row">
-            <div class="col col-sm-8"
-                 [formArrayName]="formArrayName">
-              <ng-container *ngFor="let email of formArray.controls; let i = index;"
-                            [formGroupName]="i">
-                <app-email-form [form]="email"
-                                [index]="i"
-                                [validateFormat]="true"
-                                [showRemoveButton]="i>0"
-                                (remove)="removeEmail(settingCode, healthAuthorityCode, $event)">
-                </app-email-form>
-              </ng-container>
-            </div>
-
-            <div class="col col-sm-12">
-              <button mat-button
-                      type="button"
-                      color="primary"
-                      (click)="addEmptyEmailInput(settingCode, healthAuthorityCode)">
-                <mat-icon>add</mat-icon>
-                Add email of PharmaNet administrator
-              </button>
-            </div>
-          </div>
-        </form>
-
-      </ng-template>
-
-      <ng-template #renewalConfirmation>
-        <div imageName="notification"
-             class="col-12">
-          <ng-container appInfographicHeader>
-            Share your approval with your PharmaNet administrator
-          </ng-container>
-          <ng-container appInfographicDescription>
-            When PRIME approved you to access PharmaNet, you were assigned a global PharmaNet ID (GPID).
-            <br><br>
-            Examples of when you would need to share your GPID:
-            <ul>
-              <li>If I change work sites</li>
-              <li>If I change jobs</li>
-              <li>If my worksite has new PharmaNet software</li>
-            </ul>
-          </ng-container>
-          <ng-container appInfographicContent
-                        *ngIf="enrolment.currentStatus.statusCode === EnrolmentStatus.EDITABLE">
-
-            <p>
-              To share your GPID, enter the email address of your PharmaNet administrator(s) below. A PharmaNet
-              administrator is the person in your workplace who sets up PharmaNet access.
-            </p>
-
-            <p>
-              PRIME will send your enrolment information to your PharmaNet administrator(s) so they can set up your
-              access.
-            </p>
-
-            <p class="mb-4 font-italic">
-              Note: You cannot access PharmaNet without completing this step.
-            </p>
-
-          </ng-container>
-        </div>
-      </ng-template>
-
-    </div>
-  </app-enrollee-page>
-</div>
diff --git a/prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.scss b/prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.spec.ts b/prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.spec.ts
deleted file mode 100644
index b6365ada65..0000000000
--- a/prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.spec.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { ReactiveFormsModule } from '@angular/forms';
-
-import { KeycloakService } from 'keycloak-angular';
-
-import { MockAuthService } from 'test/mocks/mock-auth.service';
-import { MockEnrolmentService } from 'test/mocks/mock-enrolment.service';
-
-import { NextStepsComponent } from './next-steps.component';
-import { NgxMaterialModule } from '@lib/modules/ngx-material/ngx-material.module';
-import { APP_CONFIG, APP_DI_CONFIG } from 'app/app-config.module';
-import { AuthService } from '@auth/shared/services/auth.service';
-import { ConfigService } from '@config/config.service';
-import { MockConfigService } from 'test/mocks/mock-config.service';
-import { EnrolmentService } from '@enrolment/shared/services/enrolment.service';
-
-describe('NextStepsComponent', () => {
-  let component: NextStepsComponent;
-  let fixture: ComponentFixture<NextStepsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [
-        HttpClientTestingModule,
-        RouterTestingModule,
-        ReactiveFormsModule,
-        NgxMaterialModule
-      ],
-      declarations: [
-        NextStepsComponent
-      ],
-      providers: [
-        {
-          provide: APP_CONFIG,
-          useValue: APP_DI_CONFIG
-        },
-        {
-          provide: AuthService,
-          useClass: MockAuthService
-        },
-        {
-          provide: ConfigService,
-          useClass: MockConfigService
-        },
-        {
-          provide: EnrolmentService,
-          useClass: MockEnrolmentService
-        },
-        KeycloakService
-      ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
-    })
-      .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NextStepsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.ts b/prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.ts
deleted file mode 100644
index d72283e017..0000000000
--- a/prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.ts
+++ /dev/null
@@ -1,454 +0,0 @@
-import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
-import { FormArray, FormBuilder, FormGroup } from '@angular/forms';
-import { MatDialog } from '@angular/material/dialog';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthService } from '@auth/shared/services/auth.service';
-import { ConfigService } from '@config/config.service';
-import { ConsoleLoggerService } from '@core/services/console-logger.service';
-import { FormUtilsService } from '@core/services/form-utils.service';
-import { ToastService } from '@core/services/toast.service';
-import { UtilsService } from '@core/services/utils.service';
-import { EnrolmentRoutes } from '@enrolment/enrolment.routes';
-import { Config } from '@config/config.model';
-import { BaseEnrolmentProfilePage } from '@enrolment/shared/classes/enrolment-profile-page.class';
-import { EnrolmentFormStateService } from '@enrolment/shared/services/enrolment-form-state.service';
-import { EnrolmentResource } from '@enrolment/shared/services/enrolment-resource.service';
-import { EnrolmentService } from '@enrolment/shared/services/enrolment.service';
-import { ConfirmDialogComponent } from '@shared/components/dialogs/confirm-dialog/confirm-dialog.component';
-import { DialogOptions } from '@shared/components/dialogs/dialog-options.model';
-import { AgreementTypeGroup } from '@shared/enums/agreement-type-group.enum';
-import { CareSettingEnum } from '@shared/enums/care-setting.enum';
-import { EnrolmentStatusEnum } from '@shared/enums/enrolment-status.enum';
-import { HealthAuthorityEnum } from '@lib/enums/health-authority.enum';
-import { Enrolment } from '@shared/models/enrolment.model';
-import { EMPTY } from 'rxjs';
-import { exhaustMap } from 'rxjs/operators';
-
-/**
- * TODO: https://bcgovmoh.atlassian.net/browse/PRIME-2325 (Refactor common code in both PharmanetEnrolmentSummaryComponent and NextStepsComponent)
- */
-@Component({
-  selector: 'app-next-steps',
-  templateUrl: './next-steps.component.html',
-  styleUrls: ['./next-steps.component.scss']
-})
-export class NextStepsComponent extends BaseEnrolmentProfilePage implements OnInit {
-  public title: string;
-  public enrolment: Enrolment;
-  public emailForm: FormGroup;
-  public hasReadAgreement: boolean;
-
-  public CareSettingEnum = CareSettingEnum;
-  public EnrolmentStatus = EnrolmentStatusEnum;
-  public HealthAuthorityEnum = HealthAuthorityEnum;
-
-  public showCommunityHealth: boolean;
-  public showPharmacist: boolean;
-  public showHealthAuthority: boolean;
-  public showDeviceProvider: boolean;
-  public currentAgreementGroup: AgreementTypeGroup;
-
-  public initialEnrolment: boolean;
-  public complete: boolean;
-  public healthAuthorities: Config<number>[];
-
-  public careSettingConfigs: {
-    setting: string,
-    settingPlural: string,
-    settingCode: number,
-    healthAuthorityCode: number,
-    formArray: FormArray,
-    formArrayName: string,
-    subheaderContent: string;
-  }[];
-
-  public constructor(
-    protected route: ActivatedRoute,
-    protected router: Router,
-    protected dialog: MatDialog,
-    private changeDetectorRef: ChangeDetectorRef,
-    private fb: FormBuilder,
-    protected enrolmentService: EnrolmentService,
-    protected enrolmentResource: EnrolmentResource,
-    protected enrolmentFormStateService: EnrolmentFormStateService,
-    protected toastService: ToastService,
-    protected logger: ConsoleLoggerService,
-    protected utilService: UtilsService,
-    protected formUtilsService: FormUtilsService,
-    protected authService: AuthService,
-    private configService: ConfigService,
-  ) {
-    super(
-      route,
-      router,
-      dialog,
-      enrolmentService,
-      enrolmentResource,
-      enrolmentFormStateService,
-      toastService,
-      logger,
-      utilService,
-      formUtilsService,
-      authService
-    );
-    this.showCommunityHealth = true;
-    this.showPharmacist = true;
-    this.showHealthAuthority = true;
-    this.showDeviceProvider = true;
-    this.title = 'Next Steps To Get PharmaNet';
-    this.careSettingConfigs = [];
-    this.healthAuthorities = this.configService.healthAuthorities;
-  }
-
-  public get careSettings() {
-    return (this.enrolment) ? this.enrolment.careSettings : null;
-  }
-
-  public get communityHealthEmails(): FormArray {
-    return this.emailForm.get('communityHealthEmails') as FormArray;
-  }
-
-  public get pharmacistEmails(): FormArray {
-    return this.emailForm.get('pharmacistEmails') as FormArray;
-  }
-
-  public get healthAuthorityFraserEmails(): FormArray {
-    return this.emailForm.get('healthAuthorityFraserEmails') as FormArray;
-  }
-
-  public get healthAuthorityNorthernEmails(): FormArray {
-    return this.emailForm.get('healthAuthorityNorthernEmails') as FormArray;
-  }
-
-  public get healthAuthorityIslandEmails(): FormArray {
-    return this.emailForm.get('healthAuthorityIslandEmails') as FormArray;
-  }
-
-  public get healthAuthorityInteriorEmails(): FormArray {
-    return this.emailForm.get('healthAuthorityInteriorEmails') as FormArray;
-  }
-
-  public get healthAuthorityPHSAEmails(): FormArray {
-    return this.emailForm.get('healthAuthorityPHSAEmails') as FormArray;
-  }
-
-  public get healthAuthorityVancouverCoastalEmails(): FormArray {
-    return this.emailForm.get('healthAuthorityVancouverCoastalEmails') as FormArray;
-  }
-
-  public get deviceProviderEmails(): FormArray {
-    return this.emailForm.get('deviceProviderEmails') as FormArray;
-  }
-
-  public getAgreementDescription() {
-    switch (this.currentAgreementGroup) {
-      case AgreementTypeGroup.ON_BEHALF_OF:
-        return 'You are an on behalf of user';
-      case AgreementTypeGroup.REGULATED_USER:
-        return 'You are an independent user';
-      default:
-        return '';
-    }
-  }
-
-  public isEmailVisible(careSettingCode: number): boolean {
-    switch (careSettingCode) {
-      case this.CareSettingEnum.PRIVATE_COMMUNITY_HEALTH_PRACTICE: {
-        return this.showCommunityHealth;
-      }
-      case this.CareSettingEnum.COMMUNITY_PHARMACIST: {
-        return this.showPharmacist;
-      }
-      case this.CareSettingEnum.HEALTH_AUTHORITY: {
-        return this.showHealthAuthority;
-      }
-      case this.CareSettingEnum.DEVICE_PROVIDER: {
-        return this.showDeviceProvider;
-      }
-      default: {
-        return false;
-      }
-    }
-  }
-
-  public sendProvisionerAccessLink() {
-
-    if (!this.atLeastOneEmailFilled()) {
-      const data: DialogOptions = {
-        title: 'Missing Email',
-        message: `Please enter at least one email for the Approval Notification.`,
-        cancelText: 'Close',
-        actionType: 'warn',
-        actionHide: true,
-      };
-      this.dialog.open(ConfirmDialogComponent, { data }).afterClosed();
-
-    } else {
-
-      const data: DialogOptions = {
-        title: 'Confirm Email',
-        message: `Are you sure you want to send your Approval Notification?`,
-        actionText: 'Send',
-      };
-      this.busy = this.dialog.open(ConfirmDialogComponent, { data })
-        .afterClosed()
-        .pipe(
-          exhaustMap((result: boolean) => {
-            if (result) {
-              this.complete = true;
-
-              let emailPairs = this.careSettingConfigs.map((config) => {
-                return {
-                  emails: config.formArray.value.map(email => email.email).filter(e => e),
-                  careSettingCode: config.settingCode,
-                  healthAuthorityCode: config.settingCode === CareSettingEnum.HEALTH_AUTHORITY ? config.healthAuthorityCode : null,
-                }
-              });
-
-              return this.enrolmentResource.sendProvisionerAccessLink(emailPairs.filter((ep) => ep.emails && ep.emails[0]), this.enrolment.id);
-            } else {
-              return EMPTY;
-            }
-          })
-        )
-        .subscribe(() => {
-          this.toastService.openSuccessToast('Email was successfully sent');
-          this.router.navigate([EnrolmentRoutes.PHARMANET_ENROLMENT_SUMMARY],
-            { relativeTo: this.route.parent, queryParams: { initialEnrolment: this.initialEnrolment } });
-        });
-      this.onPageChange({ atEnd: true });
-    }
-  }
-
-  public getEmailsGroup(careSettingCode: number, healthAuthorityCode: number) {
-    let formArray: FormArray;
-
-    switch (careSettingCode) {
-      case this.CareSettingEnum.PRIVATE_COMMUNITY_HEALTH_PRACTICE: {
-        formArray = this.communityHealthEmails;
-        break;
-      }
-      case this.CareSettingEnum.COMMUNITY_PHARMACIST: {
-        formArray = this.pharmacistEmails;
-        break;
-      }
-      case this.CareSettingEnum.HEALTH_AUTHORITY: {
-        switch (healthAuthorityCode) {
-          case this.HealthAuthorityEnum.FRASER_HEALTH: {
-            formArray = this.healthAuthorityFraserEmails;
-            break;
-          }
-          case this.HealthAuthorityEnum.INTERIOR_HEALTH: {
-            formArray = this.healthAuthorityInteriorEmails;
-            break;
-          }
-          case this.HealthAuthorityEnum.ISLAND_HEALTH: {
-            formArray = this.healthAuthorityIslandEmails;
-            break;
-          }
-          case this.HealthAuthorityEnum.PROVINCIAL_HEALTH_SERVICES_AUTHORITY: {
-            formArray = this.healthAuthorityPHSAEmails;
-            break;
-          }
-          case this.HealthAuthorityEnum.NORTHERN_HEALTH: {
-            formArray = this.healthAuthorityNorthernEmails;
-            break;
-          }
-          case this.HealthAuthorityEnum.VANCOUVER_COASTAL_HEALTH: {
-            formArray = this.healthAuthorityVancouverCoastalEmails;
-            break;
-          }
-        }
-        break;
-      }
-      case this.CareSettingEnum.DEVICE_PROVIDER: {
-        formArray = this.deviceProviderEmails;
-        break;
-      }
-    }
-    return formArray;
-  }
-
-  public sendProvisionerAccessLinkTo() {
-    let valid = true;
-    this.careSettingConfigs.forEach((config) => {
-      valid = valid && config.formArray.valid;
-      if (!config.formArray.valid) {
-        config.formArray.markAllAsTouched();
-      }
-    });
-
-    if (valid) {
-      this.sendProvisionerAccessLink();
-    }
-  }
-
-  public onPageChange(agreement: { atEnd: boolean }) {
-    if (agreement.atEnd) {
-      this.hasReadAgreement = agreement.atEnd;
-      this.changeDetectorRef.detectChanges();
-    }
-  }
-
-  public ngOnInit(): void {
-
-    this.enrolment = this.enrolmentService.enrolment;
-    this.isInitialEnrolment = this.enrolmentService.isInitialEnrolment;
-    this.initialEnrolment = this.route.snapshot.queryParams?.initialEnrolment === 'true';
-    this.createFormInstance();
-    this.patchForm().subscribe(() => this.initForm());
-
-    this.enrolmentResource.getCurrentAgreementGroupForAnEnrollee(this.enrolment.id)
-      .subscribe((group: AgreementTypeGroup) => this.currentAgreementGroup = group)
-
-    this.careSettingConfigs = [];
-    this.careSettings.forEach((careSetting) => {
-      switch (careSetting.careSettingCode) {
-        case CareSettingEnum.PRIVATE_COMMUNITY_HEALTH_PRACTICE: {
-          this.careSettingConfigs.push(
-            {
-              setting: 'Private Community Health Practice',
-              settingPlural: 'Private Community Health Practices',
-              settingCode: careSetting.careSettingCode,
-              healthAuthorityCode: null,
-              formArray: this.communityHealthEmails,
-              formArrayName: 'communityHealthEmails',
-              subheaderContent: `Send your approval to your private community health practice's PharmaNet administrator (e.g. office manager). If you work in more than one clinic make sure you include every PharmaNet administrator's email. Your PharmaNet administrator(s) will contact you once your PharmaNet access has been set up.`
-            });
-        }
-          break;
-        case CareSettingEnum.COMMUNITY_PHARMACIST: {
-          this.careSettingConfigs.push({
-            setting: 'Community Pharmacy',
-            settingPlural: 'Community Pharmacies',
-            settingCode: careSetting.careSettingCode,
-            healthAuthorityCode: null,
-            formArray: this.pharmacistEmails,
-            formArrayName: 'pharmacistEmails',
-            subheaderContent: `Send your approval to your community pharmacy's PharmaNet administrator (e.g. office manager). If you work in more than one clinic make sure you include every PharmaNet administrator's email. Your PharmaNet administrator(s) will contact you once your PharmaNet access has been set up.`
-          });
-        }
-          break;
-        case CareSettingEnum.HEALTH_AUTHORITY: {
-          this.enrolment.enrolleeHealthAuthorities.forEach((eha) => {
-            this.careSettingConfigs.push({
-              setting: `Health Authority - ${this.healthAuthorities.find((ha) => ha.code === +eha.healthAuthorityCode).name}`,
-              settingPlural: 'Health Authorities',
-              settingCode: careSetting.careSettingCode,
-              healthAuthorityCode: eha.healthAuthorityCode,
-              formArray: this.getEmailsGroup(careSetting.careSettingCode, eha.healthAuthorityCode),
-              formArrayName: this.getHAFormArrayName(eha.healthAuthorityCode),
-              subheaderContent: `Send your approval to your health authority's PharmaNet administrator (e.g. office manager). If you work in more than one clinic make sure you include every PharmaNet administrator's email. Your PharmaNet administrator(s) will contact you once your PharmaNet access has been set up.`
-            });
-          });
-        }
-          break;
-        case CareSettingEnum.DEVICE_PROVIDER: {
-          this.careSettingConfigs.push({
-            setting: 'Device Provider',
-            settingPlural: 'Device Providers',
-            settingCode: careSetting.careSettingCode,
-            healthAuthorityCode: null,
-            formArray: this.deviceProviderEmails,
-            formArrayName: 'deviceProviderEmails',
-            subheaderContent: `Send your approval to your device provider's PharmaNet administrator (e.g. office manager). If you work in more than one clinic make sure you include every PharmaNet administrator's email. Your PharmaNet administrator(s) will contact you once your PharmaNet access has been set up.`
-          });
-        }
-          break;
-      }
-    });
-  }
-
-  protected getHAFormArrayName(healthAuthorityCode: number): string {
-    switch (healthAuthorityCode) {
-      case HealthAuthorityEnum.FRASER_HEALTH:
-        return "healthAuthorityFraserEmails";
-      case HealthAuthorityEnum.INTERIOR_HEALTH:
-        return "healthAuthorityInteriorEmails";
-      case HealthAuthorityEnum.ISLAND_HEALTH:
-        return "healthAuthorityIslandEmails";
-      case HealthAuthorityEnum.NORTHERN_HEALTH:
-        return "healthAuthorityNorthernEmails";
-      case HealthAuthorityEnum.PROVINCIAL_HEALTH_SERVICES_AUTHORITY:
-        return "healthAuthorityPHSAEmails";
-      case HealthAuthorityEnum.VANCOUVER_COASTAL_HEALTH:
-        return "healthAuthorityVancouverCoastalEmails";
-    }
-    return "";
-  }
-
-  public addEmptyEmailInput(settingCode: number, healthAuthorityCode: number) {
-    let emailsArray = this.getEmailsGroup(settingCode, healthAuthorityCode);
-    this.addEmail(emailsArray);
-  }
-
-  public removeEmail(settingCode: number, healthAuthorityCode: number, index: number): void {
-    let emailsArray = this.getEmailsGroup(settingCode, healthAuthorityCode);
-    emailsArray.removeAt(index);
-  }
-
-  protected initForm() {
-    if (!this.communityHealthEmails.length) {
-      this.addEmail(this.communityHealthEmails);
-      this.addEmail(this.pharmacistEmails);
-      this.addEmail(this.healthAuthorityFraserEmails);
-      this.addEmail(this.healthAuthorityInteriorEmails);
-      this.addEmail(this.healthAuthorityIslandEmails);
-      this.addEmail(this.healthAuthorityNorthernEmails);
-      this.addEmail(this.healthAuthorityPHSAEmails);
-      this.addEmail(this.healthAuthorityVancouverCoastalEmails);
-      this.addEmail(this.deviceProviderEmails);
-    }
-  }
-
-  protected createFormInstance(): void {
-    this.emailForm = this.buildEmailGroup();
-  }
-
-  protected nextRouteAfterSubmit() {
-    let nextRoutePath: string;
-    if (!this.isProfileComplete) {
-      nextRoutePath = EnrolmentRoutes.PHARMANET_ENROLMENT_SUMMARY;
-    }
-
-    super.nextRouteAfterSubmit(nextRoutePath);
-  }
-
-  protected addEmail(emailsArray: FormArray, email?: string): void {
-    const emailForm = this.fb.group({
-      email: ['', []]
-    });
-    emailForm.patchValue({ email });
-    emailsArray.push(emailForm);
-  }
-
-  private buildEmailGroup(): FormGroup {
-    return this.fb.group({
-      communityHealthEmails: this.fb.array([], []),
-      pharmacistEmails: this.fb.array([], []),
-      healthAuthorityFraserEmails: this.fb.array([], []),
-      healthAuthorityInteriorEmails: this.fb.array([], []),
-      healthAuthorityIslandEmails: this.fb.array([], []),
-      healthAuthorityNorthernEmails: this.fb.array([], []),
-      healthAuthorityPHSAEmails: this.fb.array([], []),
-      healthAuthorityVancouverCoastalEmails: this.fb.array([], []),
-      deviceProviderEmails: this.fb.array([], []),
-    });
-  }
-
-  public atLeastOneEmailFilled(): boolean {
-    let emailFilled = false;
-
-    Object.keys(this.emailForm.controls).forEach((emailArrayKey) => {
-      const emailArray = this.emailForm.controls[emailArrayKey] as FormArray;
-      Object.keys(emailArray.controls).forEach((emailKey) => {
-        let emailControl = emailArray.controls[emailKey] as FormGroup;
-        if (emailControl.controls['email'].value && emailControl.controls['email'].value !== "") {
-          emailFilled = true;
-        }
-      });
-    });
-
-    return emailFilled;
-  }
-}
diff --git a/prime-angular-frontend/src/app/modules/enrolment/pages/pharmanet-enrolment-summary/pharmanet-enrolment-summary.component.html b/prime-angular-frontend/src/app/modules/enrolment/pages/pharmanet-enrolment-summary/pharmanet-enrolment-summary.component.html
index 86bff046c6..b8ff88dd56 100644
--- a/prime-angular-frontend/src/app/modules/enrolment/pages/pharmanet-enrolment-summary/pharmanet-enrolment-summary.component.html
+++ b/prime-angular-frontend/src/app/modules/enrolment/pages/pharmanet-enrolment-summary/pharmanet-enrolment-summary.component.html
@@ -7,31 +7,33 @@
     </app-page-header>
 
     <app-enrolment-progress-indicator *ngIf="initialEnrolment"
-                                      [inProgress]="false"
+                                      [inProgress]="!isEnrolmentComplete"
                                       [isCentered]="true"></app-enrolment-progress-indicator>
 
     <div class="row">
 
       <ng-container *ngIf="initialEnrolment; else renewalConfirmation">
-        <div *ngIf="!complete"
+        <div *ngIf="!isEnrolmentComplete"
              imageName="notification"
              class="col-12">
-          <app-page-subheader [divider]="false">
-            <ng-container appPageSubheaderTitle>Share your approval with your PharmaNet administrator</ng-container>
-            <ng-container appPageSubheaderSummary>
-              PRIME will send your enrolment information to your PharmaNet administrator(s) so they can set up your
-              access.
-              <div class="font-italic"
-                   *ngIf="enrolment.currentStatus.statusCode === EnrolmentStatus.EDITABLE">
-                Note: You cannot access PharmaNet without completing this step. If necessary, you can leave this blank
-                and
-                return to PRIME later to enter the email(s).
-              </div>
-            </ng-container>
-          </app-page-subheader>
+          <ng-container>
+            <app-page-subheader [divider]="false">
+              <ng-container appPageSubheaderTitle>Share your approval with your PharmaNet administrator</ng-container>
+              <ng-container appPageSubheaderSummary>
+                PRIME will send your enrolment information to your PharmaNet administrator(s) so they can set up your
+                access.
+                <div class="font-italic"
+                     *ngIf="enrolment.currentStatus.statusCode === EnrolmentStatus.EDITABLE">
+                  Note: You cannot access PharmaNet without completing this step. If necessary, you can leave this blank
+                  and
+                  return to PRIME later to enter the email(s).
+                </div>
+              </ng-container>
+            </app-page-subheader>
+          </ng-container>
 
           <ng-container *ngFor="let careSettingConfig of careSettingConfigs">
-            <div class="col-12 mb-4">
+            <div class="mb-4">
               <ng-container [ngTemplateOutlet]="settingEmail"
                             [ngTemplateOutletContext]="careSettingConfig">
               </ng-container>
@@ -49,7 +51,7 @@
           </div>
         </div>
 
-        <ng-container>
+        <ng-container *ngIf="isEnrolmentComplete">
           <div class="col-12">
             <ng-container>
               <p>
@@ -146,7 +148,8 @@
 
       </div>
       <div class="col">
-        <ng-container [ngTemplateOutlet]="gpidSection">
+        <ng-container *ngIf="!isNextStep || isEnrolmentComplete"
+                      [ngTemplateOutlet]="gpidSection">
         </ng-container>
       </div>
     </ng-template>
diff --git a/prime-angular-frontend/src/app/modules/enrolment/pages/pharmanet-enrolment-summary/pharmanet-enrolment-summary.component.ts b/prime-angular-frontend/src/app/modules/enrolment/pages/pharmanet-enrolment-summary/pharmanet-enrolment-summary.component.ts
index 271f11e483..68c8b4fca3 100644
--- a/prime-angular-frontend/src/app/modules/enrolment/pages/pharmanet-enrolment-summary/pharmanet-enrolment-summary.component.ts
+++ b/prime-angular-frontend/src/app/modules/enrolment/pages/pharmanet-enrolment-summary/pharmanet-enrolment-summary.component.ts
@@ -48,6 +48,8 @@ export class PharmanetEnrolmentSummaryComponent extends BaseEnrolmentPage implem
   public currentAgreementGroup: AgreementTypeGroup;
 
   public initialEnrolment: boolean;
+  public isNextStep: boolean;
+  public isEnrolmentComplete: boolean;
   public complete: boolean;
   public healthAuthorities: Config<number>[];
 
@@ -232,7 +234,8 @@ export class PharmanetEnrolmentSummaryComponent extends BaseEnrolmentPage implem
             }
           });
           this.toastService.openSuccessToast(`Email was successfully sent to ${emails.join(", ")}`);
-          this.emailForm.reset();
+          this.router.navigate([this.EnrolmentRoutes.PHARMANET_ENROLMENT_SUMMARY],
+            { relativeTo: this.route.parent, queryParams: { initialEnrolment: this.initialEnrolment, complete: 'true' } });
         });
     }
   }
@@ -266,12 +269,15 @@ export class PharmanetEnrolmentSummaryComponent extends BaseEnrolmentPage implem
   }
 
   public getTitle() {
-    if (!this.initialEnrolment) {
-      return 'Share my Global PharmaNet ID (GPID)';
-    } else if (this.complete) {
-      return 'PRIME Enrolment Complete';
+    if (this.isNextStep) {
+      return 'Next Steps to Get PharmaNet';
+    } else {
+      if (!this.initialEnrolment) {
+        return 'Share my Global PharmaNet ID (GPID)';
+      } else {
+        return 'PRIME Enrolment Complete';
+      }
     }
-    return 'Next Steps to Get PharmaNet';
   }
 
   public getAgreementDescription() {
@@ -349,6 +355,8 @@ export class PharmanetEnrolmentSummaryComponent extends BaseEnrolmentPage implem
     this.createFormInstance();
     this.isInitialEnrolment = this.enrolmentService.isInitialEnrolment;
     this.initialEnrolment = this.route.snapshot.queryParams?.initialEnrolment === 'true';
+    this.isNextStep = this.route.snapshot.url.some(v => v.path === "next-steps");
+    this.isEnrolmentComplete = this.route.snapshot.queryParams?.complete === 'true';
 
     this.enrolmentResource.getCurrentAgreementGroupForAnEnrollee(this.enrolment.id)
       .subscribe((group: AgreementTypeGroup) => this.currentAgreementGroup = group)