diff --git a/src/layouts/order-confirmation/order-confirmation.vue b/src/layouts/order-confirmation/order-confirmation.vue
index 464d0b24..2374e995 100644
--- a/src/layouts/order-confirmation/order-confirmation.vue
+++ b/src/layouts/order-confirmation/order-confirmation.vue
@@ -154,7 +154,7 @@ export default {
         var { issConfig } = this.mainStore;
         return {
             vehicle,
-            customerEmail: customer.email,
+            customerEmail: customer.emailAddress,
             payment,
             schedule,
             serviceLocation,
@@ -179,7 +179,7 @@ export default {
                 vehicleYear: this.vehicle.year,
                 vehicleMake: this.vehicle.make,
                 vehicleModel: this.vehicle.model,
-                address: this.serviceLocationFullAddress,
+                address: this.appointmentAddress,
                 inShopDuration: this.inShopAppointmentDuration,
                 email: this.customerEmail,
                 CUSTOMER_PORTAL_URL: applicationConfig.CUSTOMER_PORTAL_URL,
@@ -254,16 +254,25 @@ export default {
                 this.serviceLocation.zipCode
             }`;
         },
-        providerAddress() {
+        titleCaseProviderAddress() {
             return toTitleCase(this.providerAddress?.streetAddress);
         },
-        providerCity() {
+        titleCaseProviderCity() {
             return toTitleCase(this.providerAddress?.city);
         },
+        appointmentAddress() {
+            if (this.isMobileAppointment){
+                return this.serviceLocationFullAddress;
+            }
+            if (this.isDropOffAppointment || this.isInShopAppointment){
+                return this.providerFullAddress;
+            }
+            return null
+        },
         providerFullAddress() {
             var { state, zipCode } = this.providerAddress;
-            return this.providerAddress
-                ? `${this.providerAddress},<br/> ${this.providerCity}, ${state} ${zipCode}`
+            return this.titleCaseProviderAddress
+                ? `${this.titleCaseProviderAddress},<br/> ${this.titleCaseProviderCity}, ${state} ${zipCode}`
                 : '';
         },
         appointmentWordingText() {