diff --git a/awx/ui/client/features/credentials/add-edit-credentials.controller.js b/awx/ui/client/features/credentials/add-edit-credentials.controller.js
index 15be0eb87d..78056d8ec5 100644
--- a/awx/ui/client/features/credentials/add-edit-credentials.controller.js
+++ b/awx/ui/client/features/credentials/add-edit-credentials.controller.js
@@ -230,6 +230,8 @@ function AddEditCredentialsController (
         vm.form[field].asTag = false;
         vm.form[field]._value = '';
         vm.form[field]._tagValue = '';
+        vm.form[field]._isValid = true;
+        vm.form[field]._rejected = false;
         vm.inputSources.items = vm.inputSources.items
             .filter(({ input_field_name }) => input_field_name !== field);
         vm.inputSources.changedInputFields.push(field);
diff --git a/awx/ui/client/lib/components/form/form.directive.js b/awx/ui/client/lib/components/form/form.directive.js
index e6bb782493..7a4d7154d8 100644
--- a/awx/ui/client/lib/components/form/form.directive.js
+++ b/awx/ui/client/lib/components/form/form.directive.js
@@ -188,6 +188,10 @@ function AtFormController (eventService, strings) {
                 continue;
             }
 
+            if (vm.components[i].state.asTag) {
+                continue;
+            }
+
             if (!vm.components[i].state._isValid) {
                 isValid = false;
                 break;