diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index 594b5f073e..b753dd8ad1 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -51,8 +51,8 @@
 
 .Form-title--is_superuser{
     height:15px;
-    color: @btn-txt;
-    background-color: @btn-bg;
+    color: @default-interface-txt;
+    background-color: @default-list-header-bg;
     border-radius: 5px;
     border: 1px solid @btn-bord;
     font-size: 10px;
@@ -164,6 +164,11 @@
     max-width: none;
 }
 
+.Form-formGroup--checkbox{
+    display: flex;
+    align-items: flex-end;
+}
+
 .Form-subForm {
     width: 100%;
     margin-bottom: 15px;
diff --git a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
index 04de688cb6..90642e7f36 100644
--- a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
+++ b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
@@ -24,10 +24,6 @@ export default
                 scope: scope
             });
 
-
-            if (scope.removePostRefresh) {
-                scope.removePostRefresh();
-            }
             scope.removePostRefresh = scope.$on('PostRefresh', function () {
                 Wait('stop');
                 if (scope.notification_templates) {
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 03d2eeaac3..10930e6ac7 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -787,6 +787,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
 
                 if ((!field.readonly) || (field.readonly && options.mode === 'edit')) {
                     html += "<div class='form-group Form-formGroup ";
+                    html += (field.type === "checkbox") ? "Form-formGroup--checkbox" : "";
                     html += (field['class']) ? (field['class']) : "";
                     html += "'";
                     html += (field.ngShow) ? this.attr(field, 'ngShow') : "";