diff --git a/awx/api/views.py b/awx/api/views.py
index 4b13a8b2e9..5d7891665d 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -2727,14 +2727,14 @@ class JobTemplateCallback(GenericAPIView):
             return Response(data, status=status.HTTP_400_BAD_REQUEST)
 
         # Everything is fine; actually create the job.
+        kv = {"limit": limit, "launch_type": 'callback'}
+        if extra_vars is not None and job_template.ask_variables_on_launch:
+            kv['extra_vars'] = callback_filter_out_ansible_extra_vars(extra_vars)
         with transaction.atomic():
-            job = job_template.create_job(limit=limit, launch_type='callback')
+            job = job_template.create_job(**kv)
 
         # Send a signal to celery that the job should be started.
-        kv = {"inventory_sources_already_updated": inventory_sources_already_updated}
-        if extra_vars is not None:
-            kv['extra_vars'] = callback_filter_out_ansible_extra_vars(extra_vars)
-        result = job.signal_start(**kv)
+        result = job.signal_start(inventory_sources_already_updated=inventory_sources_already_updated)
         if not result:
             data = dict(msg=_('Error starting job!'))
             return Response(data, status=status.HTTP_400_BAD_REQUEST)
diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index 992217ec33..fd7718514b 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -300,6 +300,8 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
         Return whether job template can be used to start a new job without
         requiring any user input.
         '''
+        # It is worthwhile to find out if this function is now only used by
+        # provisioning callback.
         variables_needed = False
         if callback_extra_vars:
             extra_vars_dict = parse_yaml_or_json(callback_extra_vars)
@@ -310,10 +312,13 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
         elif self.variables_needed_to_start:
             variables_needed = True
         prompting_needed = False
-        for key, value in self._ask_for_vars_dict().iteritems():
-            if value and not (key == 'extra_vars' and
-                              callback_extra_vars is not None):
-                prompting_needed = True
+        # The behavior of provisioning callback should mimic
+        # that of job template launch, so prompting_needed should
+        # not block a provisioning callback from creating/launching jobs.
+        if callback_extra_vars is None:
+            for value in self._ask_for_vars_dict().values():
+                if value:
+                    prompting_needed = True
         return (not prompting_needed and
                 not self.passwords_needed_to_start and
                 not variables_needed)