diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index b50f6dbb52..3a2d3cd187 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -207,7 +207,10 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
                 "yearlyOtherMonth",
                 "schedulerEnd",
                 "schedulerOccurrenceCount",
-                "schedulerEndDt"
+                "schedulerEndDt",
+                "schedulerEndHour",
+                "schedulerEndMinute",
+                "schedulerEndSecond"
             ], function() {
                 $rootScope.$broadcast("loadSchedulerDetailPane");
             }, true);
diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html
index 38245c3a12..8afed91a0c 100644
--- a/awx/ui/client/src/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html
@@ -572,9 +572,9 @@
         </form>
         <div class="SchedulerFormDetail-container
             SchedulerFormDetail-container--error"
-            ng-show="!schedulerIsValid && scheduler_form.$dirty">
+            ng-show="(preview_list.isEmpty && scheduler_form.$dirty) || (!schedulerIsValid && scheduler_form.$dirty)">
             <p class="SchedulerFormDetail-errorText">
-                The scheduler options are invalid or incomplete.
+                The scheduler options are invalid, incomplete, or a date is in the past.
             </p>
         </div>
         <div class="SchedulerFormDetail-container"
@@ -607,7 +607,7 @@
                             ng-model="dateChoice"
                             id="date-choice-local"
                             value="local" >
-                        Local time
+                        Local Time Zone
                     </label>
                     <label class="radio-inline
                         SchedulerFormDetail-radioLabel">