diff --git a/awx/ui/client/src/notifications/notificationTemplates.form.js b/awx/ui/client/src/notifications/notificationTemplates.form.js
index 63a87c3bb2..e115caf709 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.form.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.form.js
@@ -393,18 +393,17 @@ export default ['i18n', function(i18n) {
                 type: 'radio_group',
                 subForm: 'typeSubForm',
                 ngShow: "notification_type.value == 'email'",
-                class: 'squeeze',
                 ngChange: "emailOptionsChange()",
                 options: [{
                     value: 'use_tls',
                     label: 'Use TLS',
                     ngShow: "notification_type.value == 'email' ",
-                    labelClass: 'checkbox-options stack-inline'
+                    labelClass: 'NotificationsForm-radioButtons'
                 }, {
                     value: 'use_ssl',
                     label: 'Use SSL',
                     ngShow: "notification_type.value == 'email'",
-                    labelClass: 'checkbox-options stack-inline'
+                    labelClass: 'NotificationsForm-radioButtons'
                 }]
             }
         },
diff --git a/awx/ui/client/src/notifications/notifications.block.less b/awx/ui/client/src/notifications/notifications.block.less
index 9744d45bca..54b71031d5 100644
--- a/awx/ui/client/src/notifications/notifications.block.less
+++ b/awx/ui/client/src/notifications/notifications.block.less
@@ -23,3 +23,7 @@
     vertical-align: middle;
     padding-right: 10px;
 }
+
+.NotificationsForm-radioButtons{
+    display:block!important;
+}
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 1f4b418799..e4facc14bf 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1264,7 +1264,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         html += ">\n";
 
                         for (i = 0; i < field.options.length; i++) {
-                            html += "<label class=\"radio-inline\" ";
+                            html += "<label class=\"radio-inline ";
+                            html += (field.options[i].labelClass) ? ` ${field.options[i].labelClass} "` : "\""; 
                             html += (field.options[i].ngShow) ? this.attr(field.options[i], 'ngShow') : "";
                             html += ">";
                             html += "<input type=\"radio\" ";