diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js
index 090f54f2a1..c75c27a96a 100644
--- a/awx/ui/client/src/forms/JobTemplates.js
+++ b/awx/ui/client/src/forms/JobTemplates.js
@@ -225,29 +225,34 @@ export default
                         text: 'Prompt on launch'
                     }
                 },
-                become_enabled: {
-                  label: 'Enable Privilege Escalation',
-                  type: 'checkbox',
-                  addRequired: false,
-                  editRequird: false,
-                  column: 2,
-                  awPopOver: "<p>If enabled, run this playbook as an administrator. This is the equivalent of passing the <code>--become</code> option to the <code>ansible-playbook</code> command. </p>",
-                  dataPlacement: 'right',
-                  dataTitle: 'Become Privilege Escalation',
-                  dataContainer: "body"
-                },
-                allow_callbacks: {
-                    label: 'Allow Provisioning Callbacks',
-                    type: 'checkbox',
-                    addRequired: false,
-                    editRequird: false,
-                    ngChange: "toggleCallback('host_config_key')",
-                    column: 2,
-                    awPopOver: "<p>Enables creation of a provisioning callback URL. Using the URL a host can contact Tower and request a configuration update " +
-                        "using this job template.</p>",
-                    dataPlacement: 'right',
-                    dataTitle: 'Allow Provisioning Callbacks',
-                    dataContainer: "body"
+                checkbox_group: {
+                    label: 'Options',
+                    type: 'checkbox_group',
+                    fields: [{
+                        name: 'become_enabled',
+                        label: 'Enable Privilege Escalation',
+                        type: 'checkbox',
+                        addRequired: false,
+                        editRequird: false,
+                        column: 2,
+                        awPopOver: "<p>If enabled, run this playbook as an administrator. This is the equivalent of passing the <code>--become</code> option to the <code>ansible-playbook</code> command. </p>",
+                        dataPlacement: 'right',
+                        dataTitle: 'Become Privilege Escalation',
+                        dataContainer: "body"
+                    }, {
+                        name: 'allow_callbacks',
+                        label: 'Allow Provisioning Callbacks',
+                        type: 'checkbox',
+                        addRequired: false,
+                        editRequird: false,
+                        ngChange: "toggleCallback('host_config_key')",
+                        column: 2,
+                        awPopOver: "<p>Enables creation of a provisioning callback URL. Using the URL a host can contact Tower and request a configuration update " +
+                            "using this job template.</p>",
+                        dataPlacement: 'right',
+                        dataTitle: 'Allow Provisioning Callbacks',
+                        dataContainer: "body"
+                    }]
                 },
                 callback_url: {
                     label: 'Provisioning Callback URL',
diff --git a/awx/ui/client/src/helpers/JobTemplates.js b/awx/ui/client/src/helpers/JobTemplates.js
index 29e9ff8d4c..88087ef44f 100644
--- a/awx/ui/client/src/helpers/JobTemplates.js
+++ b/awx/ui/client/src/helpers/JobTemplates.js
@@ -110,6 +110,11 @@ angular.module('JobTemplatesHelper', ['Utilities'])
                                           master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
                                               scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField];
                                       }
+                                      if (form.fields[fld].type === 'checkbox_group') {
+                                          for(var j=0; j<form.fields[fld].fields.length; j++) {
+                                              scope[form.fields[fld].fields[j].name] = data[form.fields[fld].fields[j].name];
+                                          }
+                                      }
                                   }
                                   Wait('stop');
                                   scope.url = data.url;
diff --git a/awx/ui/client/src/job-templates/add/job-templates-add.controller.js b/awx/ui/client/src/job-templates/add/job-templates-add.controller.js
index c8e518d5ba..6d819a0833 100644
--- a/awx/ui/client/src/job-templates/add/job-templates-add.controller.js
+++ b/awx/ui/client/src/job-templates/add/job-templates-add.controller.js
@@ -482,7 +482,14 @@
                         if (form.fields[fld].type === 'select' &&
                             fld !== 'playbook') {
                             data[fld] = $scope[fld].value;
-                        } else {
+                        }
+                        else if(form.fields[fld].type === 'checkbox_group') {
+                            // Loop across the checkboxes
+                            for(var i=0; i<form.fields[fld].fields.length; i++) {
+                                data[form.fields[fld].fields[i].name] = $scope[form.fields[fld].fields[i].name];
+                            }
+                        }
+                        else {
                             if (fld !== 'variables' &&
                                 fld !== 'survey') {
                                 data[fld] = $scope[fld];
diff --git a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
index 5065046c52..4ce6b6c0d1 100644
--- a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
+++ b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
@@ -599,7 +599,14 @@ export default
                         if (form.fields[fld].type === 'select' &&
                             fld !== 'playbook') {
                             data[fld] = $scope[fld].value;
-                        } else {
+                        }
+                        else if(form.fields[fld].type === 'checkbox_group') {
+                            // Loop across the checkboxes
+                            for(var i=0; i<form.fields[fld].fields.length; i++) {
+                                data[form.fields[fld].fields[i].name] = $scope[form.fields[fld].fields[i].name];
+                            }
+                        }
+                        else {
                             if (fld !== 'variables' &&
                                 fld !== 'survey') {
                                 data[fld] = $scope[fld];