diff --git a/awx/ui/client/src/helpers/JobTemplates.js b/awx/ui/client/src/helpers/JobTemplates.js
index 921d5b1e37..31687df847 100644
--- a/awx/ui/client/src/helpers/JobTemplates.js
+++ b/awx/ui/client/src/helpers/JobTemplates.js
@@ -155,8 +155,7 @@ angular.module('JobTemplatesHelper', ['Utilities'])
 
                                   scope.can_edit = data.summary_fields.user_capabilities.edit;
 
-
-                                  if (scope.project === "" && scope.playbook === "") {
+                                  if ((!scope.project || scope.project === "") && (!scope.playbook || scope.playbook === "")) {
                                       scope.resetProjectToDefault();
                                   }
 
diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
index 8312c09543..59f1ccd310 100644
--- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
+++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
@@ -53,10 +53,6 @@ export default
                 $scope.parseType = 'yaml';
                 $scope.showJobType = false;
 
-                if($scope.job_type && $scope.job_type.value === 'scan' && !$scope.project) {
-                    $scope.project_name = 'Default';
-                }
-
                 SurveyControllerInit({
                     scope: $scope,
                     parent_scope: $scope,
@@ -270,6 +266,7 @@ export default
                 var dft;
 
                 master = masterObject;
+
                 getPlaybooks($scope.project);
 
                 dft = ($scope.host_config_key === "" || $scope.host_config_key === null) ? false : true;