diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js
index 06d717e532..123fccd354 100644
--- a/awx/ui/client/src/forms/Groups.js
+++ b/awx/ui/client/src/forms/Groups.js
@@ -350,9 +350,9 @@ export default
 
                 for (itm in GroupFormObject.related) {
                     if (GroupFormObject.related[itm].include === "NotificationsList") {
-                        GroupFormObject.related[itm] = NotificationsList;
+                        GroupFormObject.related[itm] = angular.copy(NotificationsList);
                         GroupFormObject.related[itm].generateList = true;
-                        GroupFormObject.related[itm].disabled = "source === undefined";
+                        GroupFormObject.related[itm].disabled = "source === undefined || source.value === ''";
                     }
                 }
                 return GroupFormObject;
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 9e14e28d32..35b291c848 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1519,7 +1519,11 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                             html += `<div id="${itm}_tab"`+
                                 `class="Form-tab"`+
                                 `ng-click="${this.form.related[itm].disabled} || toggleFormTabs($event)"` +
-                                `ng-class="{'is-selected': ${itm}Selected, 'Form-tab--disabled' : ${this.form.related[itm].disabled }}">${(collection.title || collection.editTitle)} </div>`;
+                                `ng-class="{'is-selected': ${itm}Selected ` ;
+                            if(this.form.related[itm].disabled){
+                                html += `, 'Form-tab--disabled' : ${this.form.related[itm].disabled }`;
+                            }
+                            html +=  `}">${(collection.title || collection.editTitle)}</div>`;
                         }
                     }
                     else if(this.mode === "add"){