diff --git a/lib/ui/static/js/controllers/JobTemplates.js b/lib/ui/static/js/controllers/JobTemplates.js
index f7a086f47f..5ab83c120a 100644
--- a/lib/ui/static/js/controllers/JobTemplates.js
+++ b/lib/ui/static/js/controllers/JobTemplates.js
@@ -258,7 +258,7 @@ function JobTemplatesAdd ($scope, $rootScope, $compile, $location, $log, $routeP
                  .success( function(data, status, headers, config) {
                      var opts = [];
                      for (var i=0; i < data.length; i++) {
-                         opts.push({ label: data[i], value: data[i] });
+                         opts.push(data[i]);
                      }
                      scope.playbook_options = opts;
                      })
@@ -292,7 +292,7 @@ function JobTemplatesAdd ($scope, $rootScope, $compile, $location, $log, $routeP
       Rest.setUrl(defaultUrl);
       var data = {}
       for (var fld in form.fields) {
-          if (form.fields[fld].type == 'select') {
+          if (form.fields[fld].type == 'select' && fld != 'playbook') {
              data[fld] = scope[fld].value;
           }
           else {