diff --git a/package-lock.json b/package-lock.json
index 0845ee99..9bded353 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-create-ui",
-  "version": "5.11.15",
+  "version": "5.11.16",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "5.11.15",
+      "version": "5.11.16",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/approval-type": "1.0.19",
diff --git a/package.json b/package.json
index 2ab88e63..bb76f57f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.11.15",
+  "version": "5.11.16",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",
diff --git a/src/views/Amalgamation/ReviewConfirm.vue b/src/views/Amalgamation/ReviewConfirm.vue
index 89407b58..a6772330 100644
--- a/src/views/Amalgamation/ReviewConfirm.vue
+++ b/src/views/Amalgamation/ReviewConfirm.vue
@@ -117,9 +117,15 @@
       >
         <DocumentDelivery
           class="py-8 px-6"
+          :class="{ 'invalid-section': isDocumentDeliveryInvalid }"
+          :editableCompletingParty="isRoleStaff"
+          :invalidSection="isDocumentDeliveryInvalid"
           :contactValue="getBusinessContact.email"
           :completingPartyEmail="getUserEmail"
+          :documentOptionalEmail="documentOptionalEmail"
           contactLabel="Registered Office"
+          @update:optionalEmail="setDocumentOptionalEmail($event)"
+          @valid="setDocumentOptionalEmailValidity($event)"
         />
       </v-card>
     </section>
@@ -263,7 +269,7 @@ import { Component, Vue } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
 import { ContactPointIF, CertifyIF, EffectiveDateTimeIF, ShareStructureIF,
-  CourtOrderStepIF } from '@/interfaces'
+  CourtOrderStepIF, DocumentDeliveryIF } from '@/interfaces'
 import CardHeader from '@/components/common/CardHeader.vue'
 import Certify from '@/components/common/Certify.vue'
 import { CourtOrderPoa } from '@bcrs-shared-components/court-order-poa'
@@ -301,6 +307,7 @@ export default class AmalgamationReviewConfirm extends Vue {
   @Getter(useStore) getCertifyState!: CertifyIF
   @Getter(useStore) getCourtOrderStep!: CourtOrderStepIF
   @Getter(useStore) getCreateShareStructureStep!: ShareStructureIF
+  @Getter(useStore) getDocumentDelivery!: DocumentDeliveryIF
   @Getter(useStore) getEffectiveDateTime!: EffectiveDateTimeIF
   @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getFolioNumber!: string
@@ -316,6 +323,8 @@ export default class AmalgamationReviewConfirm extends Vue {
   @Action(useStore) setCertifyState!: (x: CertifyIF) => void
   @Action(useStore) setCourtOrderFileNumber!: (x: string) => void
   @Action(useStore) setCourtOrderValidity!: (x: boolean) => void
+  @Action(useStore) setDocumentOptionalEmail!: (x: string) => void
+  @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
   @Action(useStore) setEffectiveDate!: (x: Date) => void
   @Action(useStore) setEffectiveDateTimeValid!: (x: boolean) => void
   @Action(useStore) setFolioNumber!: (x: string) => void
@@ -369,6 +378,19 @@ export default class AmalgamationReviewConfirm extends Vue {
   get isAmalgamationStatementInvalid (): boolean {
     return (this.getValidateSteps && !this.getAmalgamationCourtApprovalValid)
   }
+
+  /** Is true when the Document Delivery conditions are not met. */
+  get isDocumentDeliveryInvalid (): boolean {
+    return (this.getValidateSteps && !this.getDocumentDelivery.valid)
+  }
+
+  /**
+   * Get the Document Delivery email when a staff files.
+   * Default: staff email; editable.
+   */
+  get documentOptionalEmail (): string {
+    return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail
+  }
 }
 </script>
 
diff --git a/src/views/ContinuationIn/ContinuationInReviewConfirm.vue b/src/views/ContinuationIn/ContinuationInReviewConfirm.vue
index 1d0eaa74..e5a8d299 100644
--- a/src/views/ContinuationIn/ContinuationInReviewConfirm.vue
+++ b/src/views/ContinuationIn/ContinuationInReviewConfirm.vue
@@ -130,9 +130,15 @@
       >
         <DocumentDelivery
           class="py-8 px-6"
+          :class="{ 'invalid-section': isDocumentDeliveryInvalid }"
+          :editableCompletingParty="isRoleStaff"
+          :invalidSection="isDocumentDeliveryInvalid"
           :contactValue="getBusinessContact.email"
           :completingPartyEmail="getUserEmail"
+          :documentOptionalEmail="documentOptionalEmail"
           contactLabel="Registered Office"
+          @update:optionalEmail="setDocumentOptionalEmail($event)"
+          @valid="setDocumentOptionalEmailValidity($event)"
         />
       </v-card>
     </section>
@@ -222,7 +228,8 @@ import { Component, Vue } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
 import { FilingStatus } from '@/enums'
-import { ContactPointIF, CertifyIF, EffectiveDateTimeIF, ShareStructureIF, CourtOrderStepIF } from '@/interfaces'
+import { ContactPointIF, CertifyIF, EffectiveDateTimeIF, ShareStructureIF,
+  CourtOrderStepIF, DocumentDeliveryIF } from '@/interfaces'
 import CardHeader from '@/components/common/CardHeader.vue'
 import Certify from '@/components/common/Certify.vue'
 import { DocumentDelivery } from '@bcrs-shared-components/document-delivery'
@@ -257,6 +264,7 @@ export default class ContinuationInReviewConfirm extends Vue {
   @Getter(useStore) getCertifyState!: CertifyIF
   @Getter(useStore) getCourtOrderStep!: CourtOrderStepIF
   @Getter(useStore) getCreateShareStructureStep!: ShareStructureIF
+  @Getter(useStore) getDocumentDelivery!: DocumentDeliveryIF
   @Getter(useStore) getEffectiveDateTime!: EffectiveDateTimeIF
   @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getFilingStatus!: FilingStatus
@@ -267,6 +275,8 @@ export default class ContinuationInReviewConfirm extends Vue {
   @Action(useStore) setCertifyState!: (x: CertifyIF) => void
   @Action(useStore) setCourtOrderFileNumber!: (x: string) => void
   @Action(useStore) setCourtOrderValidity!: (x: boolean) => void
+  @Action(useStore) setDocumentOptionalEmail!: (x: string) => void
+  @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
   @Action(useStore) setEffectiveDate!: (x: Date) => void
   @Action(useStore) setEffectiveDateTimeValid!: (x: boolean) => void
   @Action(useStore) setHasPlanOfArrangement!: (x: boolean) => void
@@ -302,6 +312,19 @@ export default class ContinuationInReviewConfirm extends Vue {
   get isCourtOrderInvalid (): boolean {
     return (this.getValidateSteps && !this.getCourtOrderStep.valid)
   }
+
+  /** Is true when the Document Delivery conditions are not met. */
+  get isDocumentDeliveryInvalid (): boolean {
+    return (this.getValidateSteps && !this.getDocumentDelivery.valid)
+  }
+
+  /**
+   * Get the Document Delivery email when a staff files.
+   * Default: staff email; editable.
+   */
+  get documentOptionalEmail (): string {
+    return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail
+  }
 }
 </script>
 
diff --git a/src/views/Dissolution/DissolutionReviewConfirm.vue b/src/views/Dissolution/DissolutionReviewConfirm.vue
index 42a16f3f..826fdf51 100644
--- a/src/views/Dissolution/DissolutionReviewConfirm.vue
+++ b/src/views/Dissolution/DissolutionReviewConfirm.vue
@@ -251,7 +251,7 @@
           :contactValue="getBusinessContact.email"
           :custodianEmail="getDissolutionCustodianEmail"
           :completingPartyEmail="getUserEmail"
-          :documentOptionalEmail="getDocumentDelivery.documentOptionalEmail"
+          :documentOptionalEmail="documentOptionalEmail"
           contactLabel="Registered Office"
           @update:optionalEmail="setDocumentOptionalEmail($event)"
           @valid="setDocumentOptionalEmailValidity($event)"
@@ -497,6 +497,14 @@ export default class DissolutionReviewConfirm extends Mixins(DateMixin) {
   get isCertifyInvalid (): boolean {
     return this.getValidateSteps && !(this.getCertifyState.certifiedBy && this.getCertifyState.valid)
   }
+
+  /**
+   * Get the Document Delivery email when a staff files.
+   * Default: staff email; editable.
+   */
+  get documentOptionalEmail (): string {
+    return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail
+  }
 }
 </script>
 
diff --git a/src/views/DissolutionFirm/DissolutionFirm.vue b/src/views/DissolutionFirm/DissolutionFirm.vue
index c0657408..e7abcc29 100644
--- a/src/views/DissolutionFirm/DissolutionFirm.vue
+++ b/src/views/DissolutionFirm/DissolutionFirm.vue
@@ -125,7 +125,7 @@
           :contactValue="getBusinessContact.email"
           :custodianEmail="getDissolutionCustodianEmail"
           :completingPartyEmail="getUserEmail"
-          :documentOptionalEmail="getDocumentDelivery.documentOptionalEmail"
+          :documentOptionalEmail="documentOptionalEmail"
           :additionalLabel="additionalLabel"
           :additionalValue="additionalValue"
           contactLabel="Business Contact"
@@ -501,6 +501,14 @@ export default class DissolutionFirm extends Mixins(DateMixin) {
     ]
   }
 
+  /**
+   * Get the Document Delivery email when a staff files.
+   * Default: staff email; editable.
+   */
+  get documentOptionalEmail (): string {
+    return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail
+  }
+
   /** The entity description.  */
   corpTypeDescription (): string {
     return GetCorpFullDescription(this.getEntityType as any)
diff --git a/src/views/Incorporation/IncorporationReviewConfirm.vue b/src/views/Incorporation/IncorporationReviewConfirm.vue
index 64caf722..cfefa41f 100644
--- a/src/views/Incorporation/IncorporationReviewConfirm.vue
+++ b/src/views/Incorporation/IncorporationReviewConfirm.vue
@@ -148,9 +148,15 @@
       >
         <DocumentDelivery
           class="py-8 px-6"
+          :class="{ 'invalid-section': isDocumentDeliveryInvalid }"
+          :editableCompletingParty="isRoleStaff"
+          :invalidSection="isDocumentDeliveryInvalid"
           :contactValue="getBusinessContact.email"
           :completingPartyEmail="getUserEmail"
+          :documentOptionalEmail="documentOptionalEmail"
           contactLabel="Registered Office"
+          @update:optionalEmail="setDocumentOptionalEmail($event)"
+          @valid="setDocumentOptionalEmailValidity($event)"
         />
       </v-card>
     </section>
@@ -240,7 +246,7 @@ import { Component, Vue } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
 import { ContactPointIF, CertifyIF, EffectiveDateTimeIF, IncorporationAgreementIF,
-  ShareStructureIF, CourtOrderStepIF } from '@/interfaces'
+  ShareStructureIF, CourtOrderStepIF, DocumentDeliveryIF } from '@/interfaces'
 import AgreementType from '@/components/common/AgreementType.vue'
 import CardHeader from '@/components/common/CardHeader.vue'
 import Certify from '@/components/common/Certify.vue'
@@ -277,6 +283,7 @@ export default class IncorporationReviewConfirm extends Vue {
   @Getter(useStore) getCompanyDisplayName!: string
   @Getter(useStore) getCourtOrderStep!: CourtOrderStepIF
   @Getter(useStore) getCreateShareStructureStep!: ShareStructureIF
+  @Getter(useStore) getDocumentDelivery!: DocumentDeliveryIF
   @Getter(useStore) getEffectiveDateTime!: EffectiveDateTimeIF
   @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getIncorporationAgreementStep!: IncorporationAgreementIF
@@ -289,6 +296,8 @@ export default class IncorporationReviewConfirm extends Vue {
   @Action(useStore) setCertifyState!: (x: CertifyIF) => void
   @Action(useStore) setCourtOrderFileNumber!: (x: string) => void
   @Action(useStore) setCourtOrderValidity!: (x: boolean) => void
+  @Action(useStore) setDocumentOptionalEmail!: (x: string) => void
+  @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
   @Action(useStore) setEffectiveDate!: (x: Date) => void
   @Action(useStore) setEffectiveDateTimeValid!: (x: boolean) => void
   @Action(useStore) setHasPlanOfArrangement!: (x: boolean) => void
@@ -313,6 +322,19 @@ export default class IncorporationReviewConfirm extends Vue {
   get isCourtOrderInvalid (): boolean {
     return (this.getValidateSteps && !this.getCourtOrderStep.valid)
   }
+
+  /** Is true when the Document Delivery conditions are not met. */
+  get isDocumentDeliveryInvalid (): boolean {
+    return (this.getValidateSteps && !this.getDocumentDelivery.valid)
+  }
+
+  /**
+   * Get the Document Delivery email when a staff files.
+   * Default: staff email; editable.
+   */
+  get documentOptionalEmail (): string {
+    return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail
+  }
 }
 </script>
 
diff --git a/src/views/Registration/RegistrationReviewConfirm.vue b/src/views/Registration/RegistrationReviewConfirm.vue
index cb2ca07c..8354f1db 100644
--- a/src/views/Registration/RegistrationReviewConfirm.vue
+++ b/src/views/Registration/RegistrationReviewConfirm.vue
@@ -63,6 +63,7 @@
           :contactValue="getBusinessContact.email"
           :editableCompletingParty="isRoleStaff || isSbcStaff"
           :completingPartyEmail="getUserEmail"
+          :documentOptionalEmail="documentOptionalEmail"
           :additionalLabel="documentDeliveryAdditionalLabel"
           :additionalValue="documentDeliveryAdditionalValue"
           :invalidSection="isDocumentDeliveryInvalid"
@@ -249,6 +250,14 @@ export default class RegistrationReviewConfirm extends Vue {
   get isCertifyInvalid (): boolean {
     return this.getValidateSteps && !(this.getCertifyState.certifiedBy && this.getCertifyState.valid)
   }
+
+  /**
+   * Get the Document Delivery email when a staff files.
+   * Default: staff email; editable.
+   */
+  get documentOptionalEmail (): string {
+    return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail
+  }
 }
 </script>