diff --git a/awx/ui/static/lib/ansible/directives.js b/awx/ui/static/lib/ansible/directives.js
index 6d32ab3d18..1ac2599250 100644
--- a/awx/ui/static/lib/ansible/directives.js
+++ b/awx/ui/static/lib/ansible/directives.js
@@ -169,7 +169,7 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
                     var max = (attr.awMax) ? scope.$eval(attr.awMax)  :  Infinity;
                     if (!Empty(max) && !Empty(viewValue) && Number(viewValue) >  max) {
                         ctrl.$setValidity('awMax', false);
-                        return undefined;
+                        return viewValue;
                     } else {
                         ctrl.$setValidity('awMax', true);
                         return viewValue;
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index 7e1de8279a..cda7392c2c 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -267,11 +267,11 @@
     <div id="prompt-for-days" style="display:none">
       <form name="prompt_for_days_form" id="prompt_for_days_form">
             How many days of data would you like to <b>keep</b>? <br>
-            <input type="number" id="days_to_keep" name="days_to_keep" ng-model="days_to_keep" ng-required="true" class="form-control" aw-min=0  min=0 style="margin-top:10px;" integer></input>
+            <input type="number" id="days_to_keep" name="days_to_keep" ng-model="days_to_keep" ng-required="true" class="form-control" aw-min=0  min=0 aw-max=9999 style="margin-top:10px;" integer></input>
             <div class="error" ng-show="prompt_for_days_form.days_to_keep.$dirty && prompt_for_days_form.days_to_keep.$error.required">Please enter the number of days you would like to keep this data.</div>
             <div class="error survey_error" ng-show="prompt_for_days_form.days_to_keep.$error.number || prompt_for_days_form.days_to_keep.$error.integer" >Please enter a valid number.</div>
             <div class="error survey_error" ng-show="prompt_for_days_form.days_to_keep.$error.awMin">Please enter a non-negative number.</div>
-
+            <div class="error survey_error" ng-show="prompt_for_days_form.days_to_keep.$error.awMax">Please enter a number smaller than 9999.</div>
             </form>
     </div>