diff --git a/awx/ui/client/lib/components/toggle/toggle-tag.partial.html b/awx/ui/client/lib/components/toggle/toggle-tag.partial.html
index d0070c0fbf..7997e0e741 100644
--- a/awx/ui/client/lib/components/toggle/toggle-tag.partial.html
+++ b/awx/ui/client/lib/components/toggle/toggle-tag.partial.html
@@ -1,13 +1,15 @@
 <div class="ToggleComponent-wrapper">
     <div ng-show="vm.truncated" class="ToggleComponent-container">
         <div ng-repeat="tag in vm.tags | limitTo: vm.truncatedLength">
-            <at-tag tag="tag.value" icon="{{ tag.icon }}" link="{{ tag.link }}"></at-tag>
+            <at-tag ng-if="tagType === 'cred'" tag="tag.value" icon="{{ tag.icon }}" link="{{ tag.link }}"></at-tag>
+            <at-tag ng-if="tagType !== 'cred'" tag="tag.value"></at-tag>
         </div>
         <button class="ToggleComponent-button" ng-click="vm.toggle()">{{:: vm.strings.get('toggle.VIEW_MORE') }}</button>
     </div>
     <div ng-show="!vm.truncated" class="ToggleComponent-container">
         <div ng-repeat="tag in vm.tags">
-            <at-tag tag="tag.value" icon="{{ tag.icon }}" link="{{ tag.link }}"></at-tag>
+            <at-tag ng-if="tagType === 'cred'" tag="tag.value" icon="{{ tag.icon }}" link="{{ tag.link }}"></at-tag>
+            <at-tag ng-if="tagType !== 'cred'" tag="tag.value"></at-tag>
         </div>
         <button class="ToggleComponent-button" ng-click="vm.toggle()">{{:: vm.strings.get('toggle.VIEW_LESS') }}</button>
     </div>
diff --git a/awx/ui/client/lib/services/tag.service.js b/awx/ui/client/lib/services/tag.service.js
index fa44e0e894..be1a84dbe3 100644
--- a/awx/ui/client/lib/services/tag.service.js
+++ b/awx/ui/client/lib/services/tag.service.js
@@ -9,6 +9,7 @@ function TagService (strings, $filter) {
     };
     this.buildTag = tag => {
         const value = $filter('sanitize')(tag);
+
         return { value };
     };
 }