diff --git a/pages/index.tsx b/pages/index.tsx
index 01aef2c..5a25978 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -78,7 +78,7 @@ function Index(): JSX.Element {
                             <br />
                             <br />
                             <ul className="list-decimal list-outside" style={{ marginLeft: '20px' }}>
-                                <li>Added expiration date so it aligns with the province's schedule.</li>
+                                <li>Added expiration date to Apple Wallet pass so it aligns with the province's schedule.</li>
                                 <li>On Oct 22, we will update this tool as well so you can import the official QR code into your mobile wallet too.</li>
                             </ul><br />
                             <p>{t('common:continueSpirit')}</p>
diff --git a/src/payload.ts b/src/payload.ts
index 1c45b61..392fd67 100644
--- a/src/payload.ts
+++ b/src/payload.ts
@@ -83,7 +83,14 @@ export class Payload {
         this.receipts = body.receipts;
         this.rawData = body.rawData;
         this.generic = generic;
-        this.expirationDate = '2021-10-22T23:59:59-04:00';
+        if (body.rawData.length == 0) {          // Ontario special handling
+            this.expirationDate = '2021-10-22T23:59:59-04:00';
+            generic.auxiliaryFields.push({
+                    key: "expiry",
+                    label: "Expiry Date",
+                    value: '2021-10-23'
+            })
+        }
     }
 }
 
@@ -168,5 +175,6 @@ function processReceipt(receipt: Receipt, generic: PassDictionary) : boolean {
                 value: dateOfBirth
             });
         }
+
         return fullyVaccinated;
     }