diff --git a/src/views/cipp/CIPPSettings.js b/src/views/cipp/CIPPSettings.js
index c7b45722b35f..f83a48bce9c2 100644
--- a/src/views/cipp/CIPPSettings.js
+++ b/src/views/cipp/CIPPSettings.js
@@ -1143,7 +1143,8 @@ const NotificationsSettings = () => {
                             { value: 'Alert', name: 'Alert' },
                             { value: 'Error', name: 'Error' },
                             { value: 'Info', name: 'Info' },
-                            { value: 'Warn', name: 'Warn' },
+                            { value: 'Warning', name: 'Warning' },
+                            { value: 'Critical', name: 'Critical' },
                           ]}
                         />
                       </CCol>
diff --git a/src/views/tenant/administration/AlertWizard.js b/src/views/tenant/administration/AlertWizard.js
index e0874ff2ed4f..40a310af660d 100644
--- a/src/views/tenant/administration/AlertWizard.js
+++ b/src/views/tenant/administration/AlertWizard.js
@@ -6,7 +6,7 @@ import { faCheck, faExclamationTriangle, faTimes } from '@fortawesome/free-solid
 import { CippWizard } from 'src/components/layout'
 import { WizardTableField } from 'src/components/tables'
 import PropTypes from 'prop-types'
-import { RFFCFormSelect, RFFCFormSwitch, RFFSelectSearch } from 'src/components/forms'
+import { Condition, RFFCFormSelect, RFFCFormSwitch, RFFSelectSearch } from 'src/components/forms'
 import { useLazyGenericPostRequestQuery } from 'src/store/api/app'
 import countryList from 'src/data/countryList.json'
 const Error = ({ name }) => (
@@ -98,53 +98,61 @@ const AlertWizard = () => {
             These alerts will be sent to the user or webhook configured in the CIPP notification
             settings menu.
           </p>
+          <RFFCFormSwitch
+            value={true}
+            name="SetAlerts"
+            label="Setup alerts for the selected tenants"
+          />
           <CRow>
-            <CCol>
-              <RFFCFormSwitch
-                value={true}
-                name="MFAAlertUsers"
-                label="Alert on users without any form of MFA"
-              />
-              <RFFCFormSwitch name="MFAAdmins" label="Alert on admins without any form of MFA" />
-              <RFFCFormSwitch
-                name="NoCAConfig"
-                label="Alert on tenants without a Conditional Access policy, while having Conditional Access licensing available."
-              />
-              <RFFCFormSwitch name="NewRole" label="Alert on new users added to any admin role" />
-              <RFFCFormSwitch name="AdminPassword" label="Alert on changed admin Passwords" />
-              <RFFCFormSwitch
-                name="DefenderStatus"
-                label="Alert if Defender is not running (Tenant must be on-boarded in Lighthouse)"
-              />
-              <RFFCFormSwitch
-                name="DefenderMalware"
-                label="Alert on Defender Malware found  (Tenant must be on-boarded in Lighthouse)"
-              />
-              <RFFCFormSwitch name="QuotaUsed" label="Alert on 90% mailbox quota used" />
-            </CCol>
-            <CCol>
-              <RFFCFormSwitch name="SharePointQuota" label="Alert on 90% SharePoint quota used" />
-              <RFFCFormSwitch name="UnusedLicenses" label="Alert on unused licenses" />
-              <RFFCFormSwitch name="OverusedLicenses" label="Alert on overused licenses" />
-              <RFFCFormSwitch
-                name="ExpiringLicenses"
-                label="Alert on licenses expiring in 30 days"
-              />
+            <Condition when="SetAlerts" is={true}>
+              <CCol>
+                <RFFCFormSwitch
+                  value={true}
+                  name="MFAAlertUsers"
+                  label="Alert on users without any form of MFA"
+                />
+                <RFFCFormSwitch name="MFAAdmins" label="Alert on admins without any form of MFA" />
+                <RFFCFormSwitch
+                  name="NoCAConfig"
+                  label="Alert on tenants without a Conditional Access policy, while having Conditional Access licensing available."
+                />
+                <RFFCFormSwitch name="NewRole" label="Alert on new users added to any admin role" />
+                <RFFCFormSwitch name="AdminPassword" label="Alert on changed admin Passwords" />
+                <RFFCFormSwitch
+                  name="DefenderStatus"
+                  label="Alert if Defender is not running (Tenant must be on-boarded in Lighthouse)"
+                />
+                <RFFCFormSwitch
+                  name="DefenderMalware"
+                  label="Alert on Defender Malware found  (Tenant must be on-boarded in Lighthouse)"
+                />
+                <RFFCFormSwitch name="QuotaUsed" label="Alert on 90% mailbox quota used" />
+              </CCol>
+              <CCol>
+                <RFFCFormSwitch name="SharePointQuota" label="Alert on 90% SharePoint quota used" />
+                <RFFCFormSwitch name="UnusedLicenses" label="Alert on unused licenses" />
+                <RFFCFormSwitch name="OverusedLicenses" label="Alert on overused licenses" />
+                <RFFCFormSwitch
+                  name="ExpiringLicenses"
+                  label="Alert on licenses expiring in 30 days"
+                />
 
-              <RFFCFormSwitch
-                name="AppSecretExpiry"
-                label="Alert on expiring application secrets"
-              />
-              <RFFCFormSwitch name="ApnCertExpiry" label="Alert on expiring APN certificates" />
-              <RFFCFormSwitch name="VppTokenExpiry" label="Alert on expiring VPP tokens" />
-              <RFFCFormSwitch name="DepTokenExpiry" label="Alert on expiring DEP tokens" />
-              <RFFCFormSwitch
-                name="SecDefaultsUpsell"
-                label="Alert on Security Defaults automatic enablement"
-              />
-            </CCol>
+                <RFFCFormSwitch
+                  name="AppSecretExpiry"
+                  label="Alert on expiring application secrets"
+                />
+                <RFFCFormSwitch name="ApnCertExpiry" label="Alert on expiring APN certificates" />
+                <RFFCFormSwitch name="VppTokenExpiry" label="Alert on expiring VPP tokens" />
+                <RFFCFormSwitch name="DepTokenExpiry" label="Alert on expiring DEP tokens" />
+                <RFFCFormSwitch
+                  name="SecDefaultsUpsell"
+                  label="Alert on Security Defaults automatic enablement"
+                />
+              </CCol>
+            </Condition>
           </CRow>
         </CForm>
+
         <hr className="my-4" />
       </CippWizard.Page>
       <CippWizard.Page