diff --git a/awx/ui/static/js/forms/SurveyQuestion.js b/awx/ui/static/js/forms/SurveyQuestion.js
index 2f39879574..e3fd0a056a 100644
--- a/awx/ui/static/js/forms/SurveyQuestion.js
+++ b/awx/ui/static/js/forms/SurveyQuestion.js
@@ -166,13 +166,13 @@ angular.module('SurveyQuestionFormDefinition', [])
                 control: '<div class="row">'+
                                 '<div class="col-xs-6">'+
                                     '<label for="minimum"><span class="label-text">Minimum</span></label><input id="float_min" type="number" name="float_min" ng-model="float_min" class="form-control" smart-float aw-max="float_max">'+
-                                    '<div class="error" ng-show="survey_question_form.float_min.$error.float">Please enter a valid decimal number.</div>'+
-                                    '<div class="error" ng-show="survey_question_form.float_min.$error.awMax">Please enter a smaller decimal number.</div>'+
+                                    '<div class="error" ng-show="survey_question_form.float_min.$error.float">Please enter a valid float.</div>'+
+                                    '<div class="error" ng-show="survey_question_form.float_min.$error.awMax">Please enter a smaller float.</div>'+
                                 '</div>'+
                                 '<div class="col-xs-6">'+
                                     '<label for="maximum"><span class="label-text">Maximum</span></label><input id="float_max" type="number" name="float_max" ng-model="float_max" class="form-control" smart-float  aw-min="float_min">'+
-                                    '<div class="error" ng-show="survey_question_form.float_max.$error.float">Please enter a valid decimal number.</div>'+
-                                    '<div class="error" ng-show="survey_question_form.float_max.$error.awMin">Please enter a larger decimal number.</div>'+
+                                    '<div class="error" ng-show="survey_question_form.float_max.$error.float">Please enter a valid float.</div>'+
+                                    '<div class="error" ng-show="survey_question_form.float_max.$error.awMin">Please enter a larger float.</div>'+
 
                                 '</div>'+
                             '</div>',
@@ -229,7 +229,7 @@ angular.module('SurveyQuestionFormDefinition', [])
                 control: '<div>'+
                     '<label for="default_float"><span class="label-text">Default Answer</span></label>'+
                     '<input type="number" ng-model="default_float" name="default_float" aw-min="float_min" aw-max="float_max"  class="form-control"  />'+
-                    '<div class="error" ng-show="survey_question_form.default_float.$error.number || survey_question_form.default_float.$error.float">Please enter a valid decimal number.</div>'+
+                    '<div class="error" ng-show="survey_question_form.default_float.$error.number || survey_question_form.default_float.$error.float">Please enter a valid float.</div>'+
                     '<div class="error" ng-show="survey_question_form.default_float.$error.awMin || survey_question_form.default_float.$error.awMax"> Please enter a value in the range of {{float_min}} to {{float_max}}!</div>'+
                     '</div>',
                 column: 2,
diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index 63f396909d..7089ec804f 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -784,7 +784,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
                         }
                         if (field.awPassMatch) {
                             html += "<div class=\"error\" id=\"" + this.form.name + "-" + fld + "-passmatch-error\" ng-show=\"" + this.form.name + '_form.' + fld +
-                                ".$error.awpassmatch\">This must match the password value input above.</div>\n";
+                                ".$error.awpassmatch\">This value does not match the password you entered previously.  Please confirm that password.</div>\n";
                         }
                         if (field.awValidUrl) {
                             html += "<div class=\"error\" id=\"" + this.form.name + "-" + fld + "-url-error\" ng-show=\"" + this.form.name + '_form.' + fld +