diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 177e0ff93..1cd2fa4fb 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -238,7 +238,11 @@ export default {
             const schedule = store.getters.order.schedule;
             const scheduleReqs = !!(schedule.date && schedule.startTime && schedule.endTime);
 
-            return serviceLocationReqs && scheduleReqs;
+            // Customer
+            const customer = store.getters.order.customer;
+            const customerReqs = !!customer.emailAddress;
+
+            return serviceLocationReqs && scheduleReqs && customerReqs;
         },
         forwardButtonAction() {
             window.location.assign("//www.safelite.com/");
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 867dbb3fd..9f9df5f52 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -266,7 +266,7 @@ export default {
             const scheduleReqs = !!(
                 schedule.date &&
                 schedule.startTime &&
-                (!isMobile || schedule.endTime) &&
+                schedule.endTime &&
                 schedule.jobMaxMinutes &&
                 schedule.jobMinMinutes
             );
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 6cae579ce..a6340b5db 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -312,7 +312,7 @@ export default {
             const scheduleReqs = !!(
                 schedule.date &&
                 schedule.startTime &&
-                (!isMobile || schedule.endTime) &&
+                schedule.endTime &&
                 schedule.jobMaxMinutes &&
                 schedule.jobMinMinutes
             );
diff --git a/src/layouts/review/review.vue b/src/layouts/review/review.vue
index 0011e79f7..d6ad0aa82 100644
--- a/src/layouts/review/review.vue
+++ b/src/layouts/review/review.vue
@@ -207,7 +207,7 @@ export default {
             const scheduleReqs = !!(
                 schedule.date &&
                 schedule.startTime &&
-                (!isMobile || schedule.endTime) &&
+                schedule.endTime &&
                 schedule.jobMaxMinutes &&
                 schedule.jobMinMinutes
             );