diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 7441ab422..610f8d4f8 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -72,9 +72,9 @@ https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Com
                 </div>
             </fieldset>
         </div>
-        <div class="row form-test-error mt-1">
+        <div class="row form-test-error">
             <error-message
-                class="small"
+                class="small mt-1"
                 :name="formatString(groupName)"
                 v-if="!suppressError"></error-message>
         </div>
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 1c87a2ac5..5e9662c87 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -64,9 +64,9 @@
                 </template>
             </template>
         </div>
-        <div v-show="errorMessage" class="row my-1 form-test-error">
+        <div v-show="errorMessage" class="row form-test-error">
             <span
-                class="d-inline-flex small mt-0"
+                class="d-inline-flex small my-1"
                 role="alert"
                 :class="[centerErrorMessage ? 'center-error-message' : '']"
                 >{{ errorMessage }}</span
diff --git a/src/store/index.js b/src/store/index.js
index a40c7eaeb..315a424c2 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2189,6 +2189,7 @@ async function resetScheduleIfUnavailable(context, order) {
     // If you put any kind of time stamp on the date string with dashes, then it IS parsed as local time.
     var aptDate = new Date(order.schedule.date + "T00:00:00");
     var curDate = new Date();
+    curDate.setHours(0, 0, 0, 0);
 
     // if appointment date is in the past, clear schedule
     if (aptDate.getTime() < curDate.getTime()) {