diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js
index 01bf5dcdc..e212284b8 100644
--- a/src/helpers/heritage-integration/navigation-helper.spec.js
+++ b/src/helpers/heritage-integration/navigation-helper.spec.js
@@ -305,7 +305,7 @@ describe("getPageToRouteExistingOrderTo", () => {
 describe("navigateToHeritageFunnel", () => {
     test("should save order", async () => {
         // Arrange
-        const mockReferralNumber = 2;
+        const mockReferralNumber = "2";
         const mockCorrelationId = "55";
         const mockReferralDate = "2022";
 
@@ -337,7 +337,7 @@ describe("navigateToHeritageFunnel", () => {
 
     test("should go to heritage funnel", async () => {
         // Arrange
-        const mockReferralNumber = 2;
+        const mockReferralNumber = "2";
         const mockCorrelationId = "55";
         const mockReferralDate = "2022";
 
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index b18b64a85..d64ab865d 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -38,10 +38,10 @@ export async function saveOrder() {
 
     // Save the referral information back from the store.
     await baseMixin.methods.dispatchStoreAction(storeActions.SET_REFERRAL_INFORMATION, {
-        referralNumber: savedOrderInfo.data.referralNumber,
+        referralNumber: savedOrderInfo.data.referralNumber.toString(),
         referralCorrelationId: savedOrderInfo.data.referralCorrelationId,
         referralDate: savedOrderInfo.data.referralDate,
-        accountNumber: savedOrderInfo.data.accountNumber
+        accountNumber: savedOrderInfo.data.accountNumber.toString()
     }, false);
 
     // Update the cookie with the referral information when saved.
diff --git a/src/helpers/heritage-integration/order-helper.spec.js b/src/helpers/heritage-integration/order-helper.spec.js
index 803c94b6b..b66286d50 100644
--- a/src/helpers/heritage-integration/order-helper.spec.js
+++ b/src/helpers/heritage-integration/order-helper.spec.js
@@ -103,11 +103,12 @@ describe("saveOrder", () => {
 
     test("saveOrder => should set state order values", async () => {
         // Arrange
-        const mockReferralNumber = 2;
+        const mockReferralNumber = "2";
         const mockCorrelationId = "55";
         const mockReferralDate = "2022";
+        const mockAccountNumber = "5";
 
-        const mockOrderInfo = getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate);
+        const mockOrderInfo = getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate, mockAccountNumber);
 
         const mockData = {
             actionList: [
@@ -131,7 +132,8 @@ describe("saveOrder", () => {
         expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith(storeActions.SET_REFERRAL_INFORMATION, {
             referralNumber: mockReferralNumber,
             referralDate: mockReferralDate,
-            referralCorrelationId: mockCorrelationId
+            referralCorrelationId: mockCorrelationId,
+            accountNumber: mockAccountNumber
         }, false);
     });
 
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 6577ed6ff..4f4214120 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -89,11 +89,12 @@ export function removeAllTestCookies() {
   });
 }
 
-export function getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate) {
+export function getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate, accountNumber = "0") {
   return {
       referralNumber: mockReferralNumber,
       referralCorrelationId: mockCorrelationId,
-      referralDate: mockReferralDate
+      referralDate: mockReferralDate,
+      accountNumber: accountNumber
   }
 }
 
diff --git a/src/store/index.js b/src/store/index.js
index 0d5a9e355..814ca2d5b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -573,9 +573,9 @@ export const actions = {
           state: order.serviceLocation.state,
           zipCode: order.serviceLocation.zipCode
         },
-        referralNumber: order.referralNumber,
+        referralNumber: order.referralNumber?.toString(),   // TODO It'd be nice to save these as strings in the first place
         referralDate: order.referralDate,
-        accountNumber: order.accountNumber
+        accountNumber: order.accountNumber?.toString()
       },
     });
   },
@@ -585,10 +585,10 @@ export const actions = {
       method: endpoints.LoadOrder.method,
       endpoint: endpoints.LoadOrder.url,
       payload: {
-        referralNumber: referralNumber,
+        referralNumber: referralNumber?.toString(),
         referralDate: referralDate,
         referralCorrelationId: referralCorrelationId,
-        accountNumber: accountNumber
+        accountNumber: accountNumber?.toString()
       },
     }).then((response) => {
       context.commit(storeMutations.RESET_STATE);