diff --git a/awx/ui/static/js/controllers/JobTemplates.js b/awx/ui/static/js/controllers/JobTemplates.js
index 6efc6a7e27..135d28e8a3 100644
--- a/awx/ui/static/js/controllers/JobTemplates.js
+++ b/awx/ui/static/js/controllers/JobTemplates.js
@@ -422,6 +422,7 @@ export function JobTemplatesAdd($scope, $rootScope, $compile, $location, $log, $
     $scope.removeSurveySaved = $scope.$on('SurveySaved', function() {
         Wait('stop');
         $scope.survey_exists = true;
+        $scope.invalid_survey = false;
         $('#job_templates_survey_enabled_chbox').attr('checked', true);
         $('#job_templates_delete_survey_btn').show();
         $('#job_templates_edit_survey_btn').show();
@@ -451,6 +452,7 @@ export function JobTemplatesAdd($scope, $rootScope, $compile, $location, $log, $
 
     // Save
     $scope.formSave = function () {
+        $scope.invalid_survey = false;
         if ($scope.removeGatherFormFields) {
             $scope.removeGatherFormFields();
         }
@@ -525,7 +527,14 @@ export function JobTemplatesAdd($scope, $rootScope, $compile, $location, $log, $
         });
 
         if($scope.survey_enabled === true && $scope.survey_exists!==true){
-            $scope.$emit("PromptForSurvey");
+            // $scope.$emit("PromptForSurvey");
+
+            // The original design for this was a pop up that would prompt the user if they wanted to create a
+            // survey, because they had enabled one but not created it yet. We switched this for now so that
+            // an error message would be displayed by the survey buttons that tells the user to add a survey or disabled
+            // surveys.
+            $scope.invalid_survey = true;
+            return;
         } else {
             $scope.$emit("GatherFormFields");
         }
@@ -837,6 +846,7 @@ export function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log,
     $scope.removeSurveySaved = $scope.$on('SurveySaved', function() {
         Wait('stop');
         $scope.survey_exists = true;
+        $scope.invalid_survey = false;
         $('#job_templates_survey_enabled_chbox').attr('checked', true);
         $('#job_templates_delete_survey_btn').show();
         $('#job_templates_edit_survey_btn').show();
@@ -905,7 +915,7 @@ export function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log,
 
     // Save changes to the parent
     $scope.formSave = function () {
-
+        $scope.invalid_survey = false;
         if ($scope.removeGatherFormFields) {
             $scope.removeGatherFormFields();
         }
@@ -965,7 +975,14 @@ export function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log,
         });
 
         if($scope.survey_enabled === true && $scope.survey_exists!==true){
-            $scope.$emit("PromptForSurvey");
+            // $scope.$emit("PromptForSurvey");
+
+            // The original design for this was a pop up that would prompt the user if they wanted to create a 
+            // survey, because they had enabled one but not created it yet. We switched this for now so that
+            // an error message would be displayed by the survey buttons that tells the user to add a survey or disabled
+            // surveys.
+            $scope.invalid_survey = true;
+            return;
         } else {
             $scope.$emit("GatherFormFields");
         }
diff --git a/awx/ui/static/js/forms/JobTemplates.js b/awx/ui/static/js/forms/JobTemplates.js
index 89959cd760..ad50906cd0 100644
--- a/awx/ui/static/js/forms/JobTemplates.js
+++ b/awx/ui/static/js/forms/JobTemplates.js
@@ -273,19 +273,9 @@ export default
                     column: 2,
                     control: '<button type="button" class="btn btn-sm btn-primary" id="job_templates_create_survey_btn" ng-show="survey_enabled" ng-click="addSurvey()"><i class="fa fa-pencil"></i>   Create Survey</button>'+
                             '<button style="display:none;" type="button" class="btn btn-sm btn-primary" id="job_templates_edit_survey_btn" ng-show="survey_enabled" ng-click="editSurvey()"><i class="fa fa-pencil"></i>   Edit Survey</button>'+
-                            '<button style="display:none;margin-left:5px" type="button" class="btn btn-sm btn-primary" id="job_templates_delete_survey_btn" ng-show="survey_enabled" ng-click="deleteSurvey()"><i class="fa fa-trash-o"></i>   Delete Survey</button>'
-                    // label: 'Create Survey',
-                    // type: 'text',
-                    // addRequired: false,
-                    // editRequired: false,
-                    // // readonly: true,
-                    // // ngShow: "survey_enabled",
-                    // column: 2,
-                    // awPopOver: "survey_help",
-                    // awPopOverWatch: "survey_help",
-                    // dataPlacement: 'right',
-                    // dataTitle: 'Provisioning Callback URL',
-                    // dataContainer: "body"
+                            '<button style="display:none;margin-left:5px" type="button" class="btn btn-sm btn-primary" id="job_templates_delete_survey_btn" ng-show="survey_enabled" ng-click="deleteSurvey()"><i class="fa fa-trash-o"></i>   Delete Survey</button>'+
+                            // '<div class="error ng-hide" id="job-template-survey-error" ng-show="survey_enabled === true && survey_exists!==true">A survey is enabled but it does not exist. Create a survey or disable the survey. </div>'
+                            '<div class="error ng-hide" id="job-template-survey-error" ng-show="invalid_survey">A survey is enabled but it does not exist. Create a survey or disable the survey. </div>'
                 },
                 allow_callbacks: {
                     label: 'Allow Provisioning Callbacks',