diff --git a/src/data/standards.json b/src/data/standards.json
index dbcdd1f9a6c9..6866899224a4 100644
--- a/src/data/standards.json
+++ b/src/data/standards.json
@@ -584,7 +584,7 @@
   {
     "name": "standards.OauthConsentLowSec",
     "cat": "Entra (AAD) Standards",
-    "tag": ["mediumimpact"],
+    "tag": ["mediumimpact", "IntegratedApps"],
     "helpText": "Sets the default oauth consent level so users can consent to applications that have low risks.",
     "docsDescription": "Allows users to consent to applications with low assigned risk.",
     "label": "Allow users to consent to applications with low security risk (Prevent OAuth phishing. Lower impact, less secure)",
@@ -1336,7 +1336,8 @@
       "mdo_highconfidencephishaction",
       "mdo_phisspamacation",
       "mdo_spam_notifications_only_for_admins",
-      "mdo_antiphishingpolicies"
+      "mdo_antiphishingpolicies",
+      "mdo_phishthresholdlevel"
     ],
     "helpText": "This creates a Anti-Phishing policy that automatically enables Mailbox Intelligence and spoofing, optional switches for Mailtips.",
     "addedComponent": [
@@ -2094,7 +2095,7 @@
   {
     "name": "standards.DisableSharePointLegacyAuth",
     "cat": "SharePoint Standards",
-    "tag": ["mediumimpact", "CIS"],
+    "tag": ["mediumimpact", "CIS", "spo_legacy_auth"],
     "helpText": "Disables the ability to authenticate with SharePoint using legacy authentication methods. Any applications that use legacy authentication will need to be updated to use modern authentication.",
     "docsDescription": "Disables the ability for users and applications to access SharePoint via legacy basic authentication. This will likely not have any user impact, but will block systems/applications depending on basic auth or the SharePointOnlineCredentials class.",
     "addedComponent": [],
diff --git a/src/views/cipp/UserSettings.jsx b/src/views/cipp/UserSettings.jsx
index cedc16b9e672..a7fcaa628f3e 100644
--- a/src/views/cipp/UserSettings.jsx
+++ b/src/views/cipp/UserSettings.jsx
@@ -156,28 +156,36 @@ const UserSettings = () => {
                       <CRow className="mb-3">
                         <h3 className="underline mb-5">Offboarding Defaults</h3>
                         <CCol>
-                          <RFFCFormSwitch name="RevokeSessions" label="Revoke all sessions" />
-                          <RFFCFormSwitch name="RemoveMobile" label="Remove all Mobile Devices" />
-                          <RFFCFormSwitch name="RemoveRules" label="Remove all Rules" />
-                          <RFFCFormSwitch name="RemoveLicenses" label="Remove Licenses" />
+                          <RFFCFormSwitch
+                            name="ConvertToShared"
+                            label="Convert to Shared Mailbox"
+                          />
                           <RFFCFormSwitch
                             name="HideFromGAL"
                             label="Hide from Global Address List"
                           />
-                        </CCol>
-                        <CCol>
                           <RFFCFormSwitch
-                            name="ConvertToShared"
-                            label="Convert to Shared Mailbox"
+                            name="removeCalendarInvites"
+                            label="Cancel all calendar invites"
                           />
-                          <RFFCFormSwitch name="DisableSignIn" label="Disable Sign in" />
-                          <RFFCFormSwitch name="ResetPass" label="Reset Password" />
-                          <RFFCFormSwitch name="RemoveGroups" label="Remove from all groups" />
-
+                          <RFFCFormSwitch
+                            name="removePermissions"
+                            label="Remove users mailbox permissions"
+                          />
+                          <RFFCFormSwitch name="RemoveRules" label="Remove all Rules" />
                           <RFFCFormSwitch
                             name="keepCopy"
                             label="Keep copy of forwarded mail in source mailbox"
                           />
+                          <RFFCFormSwitch name="RemoveMobile" label="Remove all Mobile Devices" />
+                        </CCol>
+                        <CCol>
+                          <RFFCFormSwitch name="RemoveGroups" label="Remove from all groups" />
+                          <RFFCFormSwitch name="RemoveLicenses" label="Remove Licenses" />
+                          <RFFCFormSwitch name="RevokeSessions" label="Revoke all sessions" />
+                          <RFFCFormSwitch name="DisableSignIn" label="Disable Sign in" />
+                          <RFFCFormSwitch name="ResetPass" label="Reset Password" />
+                          <RFFCFormSwitch name="DeleteUser" label="Delete user" />
                         </CCol>
                       </CRow>
                       <CRow className="mb-3">
diff --git a/src/views/identity/administration/OffboardingWizard.jsx b/src/views/identity/administration/OffboardingWizard.jsx
index d7008c071724..208190c00ee9 100644
--- a/src/views/identity/administration/OffboardingWizard.jsx
+++ b/src/views/identity/administration/OffboardingWizard.jsx
@@ -167,17 +167,17 @@ const OffboardingWizard = () => {
         <div className="mb-2">
           <CRow>
             <CCol className="mb-3" md={6}>
-              <RFFCFormSwitch name="RevokeSessions" label="Revoke all sessions" />
-              <RFFCFormSwitch name="RemoveMobile" label="Remove all Mobile Devices" />
+              <RFFCFormSwitch name="ConvertToShared" label="Convert to Shared Mailbox" />
+              <RFFCFormSwitch name="HideFromGAL" label="Hide from Global Address List" />
+              <RFFCFormSwitch name="removeCalendarInvites" label="Cancel all calendar invites" />
+              <RFFCFormSwitch name="removePermissions" label="Remove users mailbox permissions" />
               <RFFCFormSwitch name="RemoveRules" label="Remove all Rules" />
+              <RFFCFormSwitch name="RemoveMobile" label="Remove all Mobile Devices" />
+              <RFFCFormSwitch name="RemoveGroups" label="Remove from all groups" />
               <RFFCFormSwitch name="RemoveLicenses" label="Remove Licenses" />
-              <RFFCFormSwitch name="removePermissions" label="Remove users mailbox permissions" />
-              <RFFCFormSwitch name="ConvertToShared" label="Convert to Shared Mailbox" />
+              <RFFCFormSwitch name="RevokeSessions" label="Revoke all sessions" />
               <RFFCFormSwitch name="DisableSignIn" label="Disable Sign in" />
               <RFFCFormSwitch name="ResetPass" label="Reset Password" />
-              <RFFCFormSwitch name="RemoveGroups" label="Remove from all groups" />
-              <RFFCFormSwitch name="removeCalendarInvites" label="Cancel all calendar invites" />
-              <RFFCFormSwitch name="HideFromGAL" label="Hide from Global Address List" />
               <RFFCFormSwitch name="DeleteUser" label="Delete user" />
             </CCol>
             <CCol className="mb-3" md={6}>