diff --git a/awx/ui/client/src/templates/workflows.form.js b/awx/ui/client/src/templates/workflows.form.js
index 1825b8cf65..ac2a6a7d5a 100644
--- a/awx/ui/client/src/templates/workflows.form.js
+++ b/awx/ui/client/src/templates/workflows.form.js
@@ -82,6 +82,22 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
                     dataPlacement: 'right',
                     dataContainer: "body",
                     ngDisabled: '!(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)' // TODO: get working
+                },
+                checkbox_group: {
+                    label: i18n._('Options'),
+                    type: 'checkbox_group',
+                    fields: [{
+                        name: 'allow_simultaneous',
+                        label: i18n._('Enable Concurrent Jobs'),
+                        type: 'checkbox',
+                        column: 2,
+                        awPopOver: "<p>" + i18n._("If enabled, simultaneous runs of this workflow job template will be allowed.") + "</p>",
+                        dataPlacement: 'right',
+                        dataTitle: i18n._('Enable Concurrent Jobs'),
+                        dataContainer: "body",
+                        labelClass: 'stack-inline',
+                        ngDisabled: '!(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)'
+                    }]
                 }
             },
 
diff --git a/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js b/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
index 5c998812ee..8321e839f9 100644
--- a/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
+++ b/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
@@ -59,7 +59,14 @@ export default [
 
              try {
                  for (fld in form.fields) {
-                     data[fld] = $scope[fld];
+                     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 {
+                         data[fld] = $scope[fld];
+                     }
                  }
 
                  data.extra_vars = ToJSON($scope.parseType,
diff --git a/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js b/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
index 7b1a2d7892..a67cad1156 100644
--- a/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
+++ b/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
@@ -96,6 +96,11 @@ export default [
                     $scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
                     workflowJobTemplateData.summary_fields[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] = workflowJobTemplateData[form.fields[fld].fields[j].name];
+                    }
+                }
             }
 
             if(workflowJobTemplateData.organization) {
@@ -139,7 +144,14 @@ export default [
 
         try {
                 for (fld in form.fields) {
-                    data[fld] = $scope[fld];
+                    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 {
+                        data[fld] = $scope[fld];
+                    }
                 }
 
                 data.extra_vars = ToJSON($scope.parseType,