diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js
index 7942c02163..6d3788abab 100644
--- a/awx/ui/client/src/shared/generator-helpers.js
+++ b/awx/ui/client/src/shared/generator-helpers.js
@@ -507,10 +507,10 @@ angular.module('GeneratorHelpers', [systemStatus.name])
             } else if (field.type === 'toggle') {
                 html += "<td class=\"List-tableCell " + fld + "-column";
                 html += (field['class']) ? " " + field['class'] : "";
-                html += " " + field.columnClass;
+                html += field.columnClass ? " " + field.columnClass : "";
                 html += "\"><div class='ScheduleToggle' ng-class='{\"is-on\": " + list.iterator + ".";
-                html += (field.flag) ? field.flag : "enabled\}' ";
-                html += "aw-tool-tip='" + field.awToolTip + "' data-placement='" + field.dataPlacement + "' data-tip-watch='" + field.dataTipWatch + "'><button ";
+                html += (field.flag) ? field.flag : "enabled";
+                html += "\}' aw-tool-tip='" + field.awToolTip + "' data-placement='" + field.dataPlacement + "' data-tip-watch='" + field.dataTipWatch + "'><button ";
                 html += (field.ngDisabled) ? `ng-disabled="${field.ngDisabled}" ` : "";
                 html += "ng-show='" + list.iterator + "." ;
                 html += (field.flag) ? field.flag : 'enabled';