diff --git a/awx/ui/client/lib/angular-scheduler/lib/angular-scheduler.html b/awx/ui/client/lib/angular-scheduler/lib/angular-scheduler.html
index a13551c8a4..d20f5d6d82 100644
--- a/awx/ui/client/lib/angular-scheduler/lib/angular-scheduler.html
+++ b/awx/ui/client/lib/angular-scheduler/lib/angular-scheduler.html
@@ -25,7 +25,7 @@
             <div class="factDetailsNote" ng-if="isFactCleanup"><span class="factDetailsHeader">Note:</span> For facts collected older than the time period specified, save one fact scan (snapshot) per time window (frequency). For example, facts older than 30 days are purged, while one weekly fact scan is kept.
 Caution: Setting both numerical variables to "0" will delete all facts.</div>
 
-            <div class="form-group" ng-show="cleanupJob  && !isFactCleanup">
+            <div class="form-group" ng-if="cleanupJob  && !isFactCleanup">
                 <label><span class="red-text">*</span> Days of data to keep</label>
                 <input type="number" class="form-control input-sm" name="schedulerPurgeDays" id="schedulerPurgeDays" min="1" ng-model="schedulerPurgeDays" required placeholder="Days of data to keep">
                 <div class="error" ng-show="scheduler_form.schedulerPurgeDays.$dirty && scheduler_form.schedulerPurgeDays.$error.required">A value is required.</div>
diff --git a/awx/ui/client/lib/angular-scheduler/lib/angular-scheduler.js b/awx/ui/client/lib/angular-scheduler/lib/angular-scheduler.js
index 3a3b77d8f3..a45cfcab31 100644
--- a/awx/ui/client/lib/angular-scheduler/lib/angular-scheduler.js
+++ b/awx/ui/client/lib/angular-scheduler/lib/angular-scheduler.js
@@ -297,7 +297,10 @@ angular.module('AngularScheduler', ['underscore'])
                             }
                             return false;
                         });
-                        scope.rrule_nlp_description = rrule.toText().replace(/^RRule error.*$/,'Natural language description not available');
+                        scope.rrule_nlp_description = rrule.toText().replace(/^RRule error.*$/,'Minutely or hourly frequency selected');
+                        if(rrule === "none"){
+                            scope.rrule_nlp_description = 'Natural language description not available';
+                        }
                         scope.rrule = rrule.toString();
                     }
                 };
diff --git a/awx/ui/client/src/helpers/Schedules.js b/awx/ui/client/src/helpers/Schedules.js
index 6c07823926..05aba42be6 100644
--- a/awx/ui/client/src/helpers/Schedules.js
+++ b/awx/ui/client/src/helpers/Schedules.js
@@ -220,13 +220,13 @@ export default
                 Rest.get()
                     .success(function(data) {
                         schedule = data;
-                        if(schedule.hasOwnProperty('extra_data')) {
-                            if(schedule.extra_data.hasOwnProperty('granularity')){
-                                scope.isFactCleanup = true;
-                            } else {
-                                scope.cleanupJob = true;
-                            }
+                        if(schedule.extra_data.hasOwnProperty('granularity')){
+                            scope.isFactCleanup = true;
                         }
+                        if (schedule.extra_data.hasOwnProperty('days')){
+                            scope.cleanupJob = true;
+                        }
+
                         scope.$emit('ScheduleFound');
                     })
                     .error(function(data,status){