diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
index 5ead4a41a..d78e670c4 100644
--- a/ppr-ui/package-lock.json
+++ b/ppr-ui/package-lock.json
@@ -1,18 +1,18 @@
 {
   "name": "ppr-ui",
-  "version": "0.3.24",
+  "version": "0.3.25",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ppr-ui",
-      "version": "0.3.24",
+      "version": "0.3.25",
       "dependencies": {
         "@bcrs-shared-components/corp-type-module": "^1.0.7",
         "@bcrs-shared-components/date-picker": "^1.1.18",
         "@bcrs-shared-components/enums": "^1.0.19",
         "@bcrs-shared-components/interfaces": "^1.0.39",
-        "@bcrs-shared-components/staff-payment": "^2.0.9",
+        "@bcrs-shared-components/staff-payment": "^2.0.12",
         "@lemoncode/fonk": "^1.5.1",
         "@lemoncode/fonk-range-number-validator": "^1.1.0",
         "@sentry/browser": "^6.0.4",
@@ -1346,19 +1346,19 @@
       }
     },
     "node_modules/@bcrs-shared-components/enums": {
-      "version": "1.0.19",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.19.tgz",
-      "integrity": "sha512-a0spAVp0o5utLNSa4ymThWR9VehxQ7C/loU++mM6qT9EER5ckWcr9yMDX7FTH/hEn0XEovu49YZkFqi55nrwww==",
+      "version": "1.0.21",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.21.tgz",
+      "integrity": "sha512-pCX4SjAWgzHiNz5A8xtM3Yr9Z4K3sxLlgyk6dePtG5M42yU+NtPB1KLRD2rn/QIEsWv+lboEdcB1s2fX4CaXXg==",
       "dependencies": {
         "@bcrs-shared-components/corp-type-module": "^1.0.7"
       }
     },
     "node_modules/@bcrs-shared-components/folio-number-input": {
-      "version": "1.0.21",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.0.21.tgz",
-      "integrity": "sha512-Zr5hBDUoIe+iDNwtZtUi7uLFoPH5dXL286cf4z7l7bf8oEmY7y/tCy5d+Y7ZD3zbN2b1zlfL4mMkHYSNBjlhyQ==",
+      "version": "1.0.23",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.0.23.tgz",
+      "integrity": "sha512-A0vllGQyijqV24rlIWMZz57af2TEga12ny+TFCu+ElAlVoGyMnNhIAWksrjz61+FPWzTH5Sy3c7SAs1LaSHu6Q==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.39",
+        "@bcrs-shared-components/interfaces": "^1.0.41",
         "vue-property-decorator": "^8.4.0"
       }
     },
@@ -1374,22 +1374,22 @@
       }
     },
     "node_modules/@bcrs-shared-components/interfaces": {
-      "version": "1.0.39",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.39.tgz",
-      "integrity": "sha512-GOnxQYRvbm+VBEEOWXCDAKaUspHynTHX3BJdQE/wYEAzbMSqniF4lf1d9iySKH/KJaJyv5kZhknTktvup6BJqA==",
+      "version": "1.0.41",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.41.tgz",
+      "integrity": "sha512-QbI9L7eRZYmcZTa/kRXAv9SP2rqVE0ncL2F7ojYmbOXWon4gzhyW0SMc2MC/b03IeEWPgWK7LnL01rJuMorX2g==",
       "dependencies": {
-        "@bcrs-shared-components/enums": "^1.0.19",
+        "@bcrs-shared-components/enums": "^1.0.21",
         "vue": "2.6.12"
       }
     },
     "node_modules/@bcrs-shared-components/staff-payment": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-payment/-/staff-payment-2.0.9.tgz",
-      "integrity": "sha512-YHIJnOmP0n4/ls+zmSC9rMlhVI3oH01uHXCf2YbzRklHoE39arO8WrjYAAWsOHVy3C4FvCBQ/Ko7JW7ZGbVElQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-payment/-/staff-payment-2.0.12.tgz",
+      "integrity": "sha512-ecoKlXEvdT4GImpmEyKa4pX2KnfD+ipt9uLi18jxNw5J62Cs1tcicnZNvbmDZboA9v4RR2rJcPiY1ViOXWHuSw==",
       "dependencies": {
-        "@bcrs-shared-components/enums": "^1.0.19",
-        "@bcrs-shared-components/folio-number-input": "^1.0.21",
-        "@bcrs-shared-components/interfaces": "^1.0.39",
+        "@bcrs-shared-components/enums": "^1.0.21",
+        "@bcrs-shared-components/folio-number-input": "^1.0.23",
+        "@bcrs-shared-components/interfaces": "^1.0.41",
         "vue-property-decorator": "^8.4.0"
       }
     },
@@ -22539,19 +22539,19 @@
       }
     },
     "@bcrs-shared-components/enums": {
-      "version": "1.0.19",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.19.tgz",
-      "integrity": "sha512-a0spAVp0o5utLNSa4ymThWR9VehxQ7C/loU++mM6qT9EER5ckWcr9yMDX7FTH/hEn0XEovu49YZkFqi55nrwww==",
+      "version": "1.0.21",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.21.tgz",
+      "integrity": "sha512-pCX4SjAWgzHiNz5A8xtM3Yr9Z4K3sxLlgyk6dePtG5M42yU+NtPB1KLRD2rn/QIEsWv+lboEdcB1s2fX4CaXXg==",
       "requires": {
         "@bcrs-shared-components/corp-type-module": "^1.0.7"
       }
     },
     "@bcrs-shared-components/folio-number-input": {
-      "version": "1.0.21",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.0.21.tgz",
-      "integrity": "sha512-Zr5hBDUoIe+iDNwtZtUi7uLFoPH5dXL286cf4z7l7bf8oEmY7y/tCy5d+Y7ZD3zbN2b1zlfL4mMkHYSNBjlhyQ==",
+      "version": "1.0.23",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.0.23.tgz",
+      "integrity": "sha512-A0vllGQyijqV24rlIWMZz57af2TEga12ny+TFCu+ElAlVoGyMnNhIAWksrjz61+FPWzTH5Sy3c7SAs1LaSHu6Q==",
       "requires": {
-        "@bcrs-shared-components/interfaces": "^1.0.39",
+        "@bcrs-shared-components/interfaces": "^1.0.41",
         "vue-property-decorator": "^8.4.0"
       },
       "dependencies": {
@@ -22566,22 +22566,22 @@
       }
     },
     "@bcrs-shared-components/interfaces": {
-      "version": "1.0.39",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.39.tgz",
-      "integrity": "sha512-GOnxQYRvbm+VBEEOWXCDAKaUspHynTHX3BJdQE/wYEAzbMSqniF4lf1d9iySKH/KJaJyv5kZhknTktvup6BJqA==",
+      "version": "1.0.41",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.41.tgz",
+      "integrity": "sha512-QbI9L7eRZYmcZTa/kRXAv9SP2rqVE0ncL2F7ojYmbOXWon4gzhyW0SMc2MC/b03IeEWPgWK7LnL01rJuMorX2g==",
       "requires": {
-        "@bcrs-shared-components/enums": "^1.0.19",
+        "@bcrs-shared-components/enums": "^1.0.21",
         "vue": "2.6.12"
       }
     },
     "@bcrs-shared-components/staff-payment": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-payment/-/staff-payment-2.0.9.tgz",
-      "integrity": "sha512-YHIJnOmP0n4/ls+zmSC9rMlhVI3oH01uHXCf2YbzRklHoE39arO8WrjYAAWsOHVy3C4FvCBQ/Ko7JW7ZGbVElQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-payment/-/staff-payment-2.0.12.tgz",
+      "integrity": "sha512-ecoKlXEvdT4GImpmEyKa4pX2KnfD+ipt9uLi18jxNw5J62Cs1tcicnZNvbmDZboA9v4RR2rJcPiY1ViOXWHuSw==",
       "requires": {
-        "@bcrs-shared-components/enums": "^1.0.19",
-        "@bcrs-shared-components/folio-number-input": "^1.0.21",
-        "@bcrs-shared-components/interfaces": "^1.0.39",
+        "@bcrs-shared-components/enums": "^1.0.21",
+        "@bcrs-shared-components/folio-number-input": "^1.0.23",
+        "@bcrs-shared-components/interfaces": "^1.0.41",
         "vue-property-decorator": "^8.4.0"
       },
       "dependencies": {
diff --git a/ppr-ui/package.json b/ppr-ui/package.json
index 0cea99e60..e3505fdbc 100644
--- a/ppr-ui/package.json
+++ b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "0.3.24",
+  "version": "0.3.25",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",
@@ -18,7 +18,7 @@
     "@bcrs-shared-components/date-picker": "^1.1.18",
     "@bcrs-shared-components/enums": "^1.0.19",
     "@bcrs-shared-components/interfaces": "^1.0.39",
-    "@bcrs-shared-components/staff-payment": "^2.0.9",
+    "@bcrs-shared-components/staff-payment": "^2.0.12",
     "@lemoncode/fonk": "^1.5.1",
     "@lemoncode/fonk-range-number-validator": "^1.1.0",
     "@sentry/browser": "^6.0.4",
diff --git a/ppr-ui/src/composables/fees/factories/useFeeSummary.ts b/ppr-ui/src/composables/fees/factories/useFeeSummary.ts
index d2167e7b6..c94df4180 100644
--- a/ppr-ui/src/composables/fees/factories/useFeeSummary.ts
+++ b/ppr-ui/src/composables/fees/factories/useFeeSummary.ts
@@ -86,7 +86,6 @@ export function getFeeSummary (
     return { ...defaultFeeSummaries[FeeSummaryDefaults.SEARCH_7] }
   }
   if (feeType === FeeSummaryTypes.NEW_MHR) {
-    if (isStaff) return { ...defaultFeeSummaries[FeeSummaryDefaults.NO_FEE] }
     return { ...defaultFeeSummaries[FeeSummaryDefaults.DEFAULT_50] }
   }
   if (feeType === FeeSummaryTypes.MHR_COMBINED_SEARCH) {
diff --git a/ppr-ui/src/views/newMhrRegistration/MhrReviewConfirm.vue b/ppr-ui/src/views/newMhrRegistration/MhrReviewConfirm.vue
index e7220b407..59a15066f 100644
--- a/ppr-ui/src/views/newMhrRegistration/MhrReviewConfirm.vue
+++ b/ppr-ui/src/views/newMhrRegistration/MhrReviewConfirm.vue
@@ -38,7 +38,7 @@
       <v-card flat class="mt-6 pa-6" :class="{ 'border-error-left': validateStaffPayment }">
         <StaffPayment
           id="staff-payment"
-          :staffPaymentData="staffPaymentData"
+          :staffPaymentData="staffPayment"
           :validate="isValidatingApp"
           :displaySideLabel="true"
           :displayPriorityCheckbox="true"
@@ -96,8 +96,7 @@ export default defineComponent({
       setValidation,
       scrollToInvalid,
       getValidation,
-      getStepValidation,
-      getSectionValidation
+      getStepValidation
     } = useMhrValidations(toRefs(getMhrRegistrationValidationModel.value))
 
     const localState = reactive({
@@ -114,18 +113,16 @@ export default defineComponent({
         return localState.isValidatingApp &&
           !getValidation(MhrSectVal.REVIEW_CONFIRM_VALID, MhrCompVal.STAFF_PAYMENT_VALID)
       }),
-      staffPaymentData:
-        getStaffPayment.value ||
-        ({
-          option: StaffPaymentOptions.NONE,
-          routingSlipNumber: '',
-          bcolAccountNumber: '',
-          datNumber: '',
-          folioNumber: '',
-          isPriority: false
-        } as StaffPaymentIF),
       paymentOption: StaffPaymentOptions.NONE,
-      staffPaymentValid: false
+      staffPaymentValid: false,
+      staffPayment: {
+        option: StaffPaymentOptions.NONE,
+        routingSlipNumber: '',
+        bcolAccountNumber: '',
+        datNumber: '',
+        folioNumber: '',
+        isPriority: false
+      }
     })
 
     const onStaffPaymentDataUpdate = (val: StaffPaymentIF) => {
@@ -180,6 +177,7 @@ export default defineComponent({
           break
       }
 
+      localState.staffPayment = staffPaymentData
       setStaffPayment(staffPaymentData)
     }
 
@@ -236,4 +234,15 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 @import '@/assets/styles/theme.scss';
+
+#mhr-staff-payment-section {
+  ::v-deep {
+    .theme--light.v-text-field.v-input--is-disabled .v-input__slot::before {
+      border-style: dashed;
+    }
+    .theme--light.v-label--is-disabled {
+      color: $gray7;
+    }
+  }
+}
 </style>