diff --git a/awx/ui/client/src/configuration/configuration.controller.js b/awx/ui/client/src/configuration/configuration.controller.js
index 51bc404fdd..7d35be84e3 100644
--- a/awx/ui/client/src/configuration/configuration.controller.js
+++ b/awx/ui/client/src/configuration/configuration.controller.js
@@ -321,6 +321,9 @@ export default [
                         // We need to re-instantiate the Select2 element
                         // after resetting the value. Example:
                         $scope.$broadcast(key+'_populated', null, false);
+                        if(key === "AD_HOC_COMMANDS"){
+                            $scope.$broadcast(key+'_reverted', null, false);
+                        }
                     }
                     else if($scope[key + '_field'].reset === "CUSTOM_LOGO"){
                         $scope.$broadcast(key+'_reverted');
@@ -379,7 +382,7 @@ export default [
                     //Parse dropdowns and dropdowns labeled as lists
                     if($scope[key] === null) {
                         payload[key] = null;
-                    } else if($scope[key][0] && $scope[key][0].value !== undefined) {
+                    } else if(!_.isEmpty($scope[`${key}_values`])) {
                         if(multiselectDropdowns.indexOf(key) !== -1) {
                             // Handle AD_HOC_COMMANDS
                             payload[key] = $scope[`${key}_values`];
@@ -501,6 +504,9 @@ export default [
                             // We need to re-instantiate the Select2 element
                             // after resetting the value. Example:
                             $scope.$broadcast(key+'_populated', null, false);
+                            if(key === "AD_HOC_COMMANDS"){
+                                $scope.$broadcast(key+'_reverted', null, false);
+                            }
                         }
                         else if($scope[key + '_field'].reset === "CUSTOM_LOGO"){
                             $scope.$broadcast(key+'_reverted');
diff --git a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js
index df6f8f28af..7325c8fd42 100644
--- a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js
+++ b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js
@@ -108,17 +108,33 @@ export default [
                 addNew: true,
                 placeholder: i18n._('Select commands')
             });
+
         }
 
-        function revertAdHocCommands (defaults) {
-            $scope.$parent.AD_HOC_COMMANDS = defaults.map(value => ({
+        function revertAdHocCommands () {
+            $scope.$parent.AD_HOC_COMMANDS = $scope.$parent.configDataResolve.AD_HOC_COMMANDS.default.map(value => ({
                 value,
                 name: value,
                 label: value
             }));
 
+            $('.select2-selection__choice').each(function(i, element){
+                if(!_.contains($scope.$parent.configDataResolve.AD_HOC_COMMANDS.default, element.title)){
+                    $(`#configuration_jobs_template_AD_HOC_COMMANDS option[value='${element.title}']`).remove();
+                    element.remove();
+                }
+            });
+
             $scope.$parent.AD_HOC_COMMANDS_options = $scope.$parent.AD_HOC_COMMANDS.map(tag => tag);
             $scope.$parent.AD_HOC_COMMANDS_values = $scope.$parent.AD_HOC_COMMANDS.map(tag => tag.value);
+            CreateSelect2({
+                element: '#configuration_jobs_template_AD_HOC_COMMANDS',
+                multiple: true,
+                addNew: true,
+                placeholder: i18n._('Select commands'),
+                options: $scope.$parent.AD_HOC_COMMANDS_options
+            });
+
         }
 
         // Fix for bug where adding selected opts causes form to be $dirty and triggering modal
@@ -131,21 +147,21 @@ export default [
         // Managing the state of select2's tags since the behavior is unpredictable otherwise.
         let commandsElement = $('#configuration_jobs_template_AD_HOC_COMMANDS');
 
-        commandsElement.on('select2:select', event => { 
+        commandsElement.on('select2:select', event => {
             let command = event.params.data.text;
             let commands = $scope.$parent.AD_HOC_COMMANDS_values;
 
             commands.push(command);
         });
 
-        commandsElement.on('select2:unselect', event => { 
+        commandsElement.on('select2:unselect', event => {
             let command = event.params.data.text;
             let commands = $scope.$parent.AD_HOC_COMMANDS_values;
 
             $scope.$parent.AD_HOC_COMMANDS_values = commands.filter(value => value !== command);
         });
 
-        $scope.$on('AD_HOC_COMMANDS_reverted', (e, defaults) => revertAdHocCommands(defaults));
+        $scope.$on('AD_HOC_COMMANDS_reverted', () => revertAdHocCommands());
 
         /*
          * Controllers for each tab are initialized when configuration is opened. A listener
@@ -174,7 +190,7 @@ export default [
 
         /*
          * This event is fired if the user navigates directly to this tab, where the
-         * $locationChangeStart does not. Watching this and location ensure proper display on 
+         * $locationChangeStart does not. Watching this and location ensure proper display on
          * direct load of this tab or if the user comes from a different tab.
          */
         $scope.$on('populated', () => {