diff --git a/src/components/forms/RFFComponents.jsx b/src/components/forms/RFFComponents.jsx
index b72a840d4989..516098532900 100644
--- a/src/components/forms/RFFComponents.jsx
+++ b/src/components/forms/RFFComponents.jsx
@@ -253,6 +253,54 @@ RFFCFormInputArray.propTypes = {
   ...sharedPropTypes,
 }
 
+export const RFFCFormInputList = ({ name, label, className = 'mb-3' }) => {
+  return (
+    <>
+      <FieldArray name={name}>
+        {({ fields }) => (
+          <div>
+            <div className="mb-2">
+              {label && (
+                <CFormLabel className="me-2" htmlFor={name}>
+                  {label}
+                </CFormLabel>
+              )}
+              <CButton
+                onClick={() => fields.push({ Key: '', Value: '' })}
+                className="circular-button"
+                title={'+'}
+              >
+                <FontAwesomeIcon icon={'plus'} />
+              </CButton>
+            </div>
+            {fields.map((name, index) => (
+              <div key={name} className={className}>
+                <div>
+                  <Field name={`${name}`} component="input">
+                    {({ input, meta }) => {
+                      return <CFormInput placeholder="Value" {...input} className="mb-2" />
+                    }}
+                  </Field>
+                </div>
+                <CButton
+                  onClick={() => fields.remove(index)}
+                  className={`circular-button`}
+                  title={'-'}
+                >
+                  <FontAwesomeIcon icon={'minus'} />
+                </CButton>
+              </div>
+            ))}
+          </div>
+        )}
+      </FieldArray>
+    </>
+  )
+}
+RFFCFormInputList.propTypes = {
+  ...sharedPropTypes,
+}
+
 export const RFFCFormRadio = ({
   name,
   label,
@@ -463,10 +511,10 @@ export const RFFSelectSearch = ({
   isLoading = false,
   allowCreate = false,
   refreshFunction,
-  props,
+  ...props
 }) => {
   const [inputText, setInputText] = useState('')
-  const selectSearchvalues = values.map((val) => ({
+  const selectSearchValues = values.map((val) => ({
     value: val.value,
     label: val.name,
     ...val.props,
@@ -490,12 +538,33 @@ export const RFFSelectSearch = ({
   return (
     <Field name={name} validate={validate}>
       {({ meta, input }) => {
-        const handleChange = onChange
-          ? (e) => {
-              input.onChange(e)
-              onChange(e)
-            }
-          : input.onChange
+        const handleChange = (e) => {
+          if (onChange) {
+            onChange(e)
+          }
+          input.onChange(e)
+        }
+
+        const selectProps = {
+          classNamePrefix: 'react-select',
+          ...input,
+          name,
+          id: name,
+          disabled,
+          options: selectSearchValues,
+          placeholder,
+          isMulti: multi,
+          inputValue: inputText,
+          isLoading,
+          onChange: handleChange,
+          onInputChange: setOnInputChange,
+          ...props,
+          //merge className from props into the default className
+          className: props.className
+            ? `${props.className} react-select-container`
+            : 'react-select-container',
+        }
+
         return (
           <div>
             <CFormLabel htmlFor={name}>
@@ -513,79 +582,10 @@ export const RFFSelectSearch = ({
                 </CTooltip>
               )}
             </CFormLabel>
-            {!allowCreate && onChange && (
-              <Select
-                className="react-select-container"
-                classNamePrefix="react-select"
-                {...input}
-                isClearable={false}
-                name={name}
-                id={name}
-                disabled={disabled}
-                options={selectSearchvalues}
-                placeholder={placeholder}
-                isMulti={multi}
-                onChange={handleChange}
-                onInputChange={debounceOnInputChange}
-                inputValue={inputText}
-                isLoading={isLoading}
-                {...props}
-              />
-            )}
-            {!allowCreate && !onChange && (
-              <Select
-                className="react-select-container"
-                classNamePrefix="react-select"
-                {...input}
-                isClearable={true}
-                name={name}
-                id={name}
-                disabled={disabled}
-                options={selectSearchvalues}
-                placeholder={placeholder}
-                onInputChange={setOnInputChange}
-                isMulti={multi}
-                inputValue={inputText}
-                isLoading={isLoading}
-                {...props}
-              />
-            )}
-            {allowCreate && onChange && (
-              <Creatable
-                className="react-select-container"
-                classNamePrefix="react-select"
-                {...input}
-                isClearable={false}
-                name={name}
-                id={name}
-                disabled={disabled}
-                options={selectSearchvalues}
-                placeholder={placeholder}
-                isMulti={multi}
-                onChange={handleChange}
-                onInputChange={debounceOnInputChange}
-                inputValue={inputText}
-                isLoading={isLoading}
-                {...props}
-              />
-            )}
-            {allowCreate && !onChange && (
-              <Creatable
-                className="react-select-container"
-                classNamePrefix="react-select"
-                {...input}
-                isClearable={true}
-                name={name}
-                id={name}
-                disabled={disabled}
-                options={selectSearchvalues}
-                placeholder={placeholder}
-                onInputChange={setOnInputChange}
-                isMulti={multi}
-                inputValue={inputText}
-                isLoading={isLoading}
-                {...props}
-              />
+            {allowCreate ? (
+              <Creatable {...selectProps} isClearable={true} />
+            ) : (
+              <Select {...selectProps} isClearable={!onChange} />
             )}
             {meta.error && meta.touched && (
               <span className="text-danger">
diff --git a/src/components/forms/index.js b/src/components/forms/index.js
index 00a76ee4554a..aa36929d58da 100644
--- a/src/components/forms/index.js
+++ b/src/components/forms/index.js
@@ -10,6 +10,7 @@ import {
   RFFCFormSelect,
   RFFSelectSearch,
   RFFCFormInputArray,
+  RFFCFormInputList,
 } from 'src/components/forms/RFFComponents'
 
 export {
@@ -24,4 +25,5 @@ export {
   RFFCFormSelect,
   RFFSelectSearch,
   RFFCFormInputArray,
+  RFFCFormInputList,
 }
diff --git a/src/components/utilities/CippFuzzySearch.jsx b/src/components/utilities/CippFuzzySearch.jsx
index e7efe8d0bc1a..ec176e77d340 100644
--- a/src/components/utilities/CippFuzzySearch.jsx
+++ b/src/components/utilities/CippFuzzySearch.jsx
@@ -4,7 +4,7 @@ import Fuse from 'fuse.js'
 function CippfuzzySearch(options) {
   const fuse = new Fuse(options, {
     keys: ['name', 'groupName', 'items.name'],
-    threshold: 0.5,
+    threshold: 0.3,
     location: 0,
     ignoreLocation: true,
     useExtendedSearch: true,
@@ -15,8 +15,8 @@ function CippfuzzySearch(options) {
     if (!value.length) {
       return options
     }
-
-    return fuse.search(value).map((_ref) => {
+    const search = fuse.search(value)
+    return search.map((_ref) => {
       let { item } = _ref
       return item
     })
diff --git a/src/components/utilities/TenantSelector.jsx b/src/components/utilities/TenantSelector.jsx
index df8eb7d00459..36a9bd8764e7 100644
--- a/src/components/utilities/TenantSelector.jsx
+++ b/src/components/utilities/TenantSelector.jsx
@@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux'
 import PropTypes from 'prop-types'
 import { useListTenantsQuery } from 'src/store/api/tenants'
 import { setCurrentTenant } from 'src/store/features/app'
-import { CButton, CDropdown, CDropdownMenu, CDropdownToggle } from '@coreui/react'
+import { CButton } from '@coreui/react'
 import { useNavigate, useSearchParams } from 'react-router-dom'
 import { queryString } from 'src/helpers'
 import { faBuilding } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/data/Extensions.json b/src/data/Extensions.json
index 98a5c9a5a3f2..1ca3a87b94d7 100644
--- a/src/data/Extensions.json
+++ b/src/data/Extensions.json
@@ -160,5 +160,65 @@
       }
     ],
     "mappingRequired": true
+  },
+  {
+    "name": "PasswordPusher",
+    "type": "PWPush",
+    "cat": "Passwords",
+    "forceSyncButton": false,
+    "helpText": "This integration allows you to generate password links instead of plain text passwords. Visit https://pwpush.com/ or https://github.com/pglombardo/PasswordPusher for more information.",
+    "SettingOptions": [
+      {
+        "type": "checkbox",
+        "name": "PWPush.Enabled",
+        "label": "Replace generated passwords with PWPush links"
+      },
+      {
+        "type": "input",
+        "fieldtype": "text",
+        "name": "PWPush.BaseUrl",
+        "label": "PWPush URL",
+        "placeholder": "Enter your PWPush URL. (default: https://pwpush.com)"
+      },
+      {
+        "type": "input",
+        "fieldtype": "text",
+        "name": "PWPush.EmailAddress",
+        "label": "PWPush email address",
+        "placeholder": "Enter your email address for PWPush. (optional)"
+      },
+      {
+        "type": "input",
+        "fieldtype": "password",
+        "name": "PWPush.APIKey",
+        "label": "PWPush API Key",
+        "placeholder": "Enter your PWPush API Key. (optional)"
+      },
+      {
+        "type": "checkbox",
+        "name": "PWPush.RetrievalStep",
+        "label": "Click to retrieve password (recommended)"
+      },
+      {
+        "type": "input",
+        "fieldtype": "number",
+        "name": "PWPush.ExpireAfterDays",
+        "label": "Expiration in Days",
+        "placeholder": "Expiration time in days. (optional)"
+      },
+      {
+        "type": "input",
+        "fieldtype": "number",
+        "name": "PWPush.ExpireAfterViews",
+        "label": "Expiration after views",
+        "placeholder": "Expiration after views. (optional)"
+      },
+      {
+        "type": "checkbox",
+        "name": "PWPush.DeletableByViewer",
+        "label": "Allow deletion of passwords"
+      }
+    ],
+    "mappingRequired": false
   }
 ]
diff --git a/src/data/standards.json b/src/data/standards.json
index d1b9e020ded7..28c9f0cdecab 100644
--- a/src/data/standards.json
+++ b/src/data/standards.json
@@ -121,6 +121,16 @@
     "impact": "Low Impact",
     "impactColour": "info"
   },
+  {
+    "name": "standards.EnablePronouns",
+    "cat": "Global Standards",
+    "tag": ["lowimpact"],
+    "helpText": "Enables the Pronouns feature for the tenant. This allows users to set their pronouns in their profile.",
+    "addedComponent": [],
+    "label": "Enable Pronouns",
+    "impact": "Low Impact",
+    "impactColour": "info"
+  },
   {
     "name": "standards.AnonReportDisable",
     "cat": "Global Standards",
@@ -1102,6 +1112,44 @@
         "name": "standards.AntiPhishPolicy.EnableUnusualCharactersSafetyTips",
         "default": true
       },
+      {
+        "type": "Select",
+        "label": "If a message is detected as user impersonation",
+        "name": "standards.AntiPhishPolicy.TargetedUserProtectionAction",
+        "values": [
+          {
+            "label": "Move to Junk Folder",
+            "value": "MoveToJmf"
+          },
+          {
+            "label": "Delete the message before its delivered",
+            "value": "Delete"
+          },
+          {
+            "label": "Quarantine the message",
+            "value": "Quarantine"
+          }
+        ]
+      },
+      {
+        "type": "Select",
+        "label": "If a message is detected as domain impersonation",
+        "name": "standards.AntiPhishPolicy.TargetedDomainProtectionAction",
+        "values": [
+          {
+            "label": "Move to Junk Folder",
+            "value": "MoveToJmf"
+          },
+          {
+            "label": "Delete the message before its delivered",
+            "value": "Delete"
+          },
+          {
+            "label": "Quarantine the message",
+            "value": "Quarantine"
+          }
+        ]
+      },
       {
         "type": "Select",
         "label": "If Mailbox Intelligence detects an impersonated user",
diff --git a/src/views/cipp/Extensions.jsx b/src/views/cipp/Extensions.jsx
index d42e79d9bb38..7bfe1d7feb86 100644
--- a/src/views/cipp/Extensions.jsx
+++ b/src/views/cipp/Extensions.jsx
@@ -10,7 +10,7 @@ import {
   CTabContent,
   CTabPane,
 } from '@coreui/react'
-import { CippPage } from 'src/components/layout'
+import { CippCallout, CippPage } from 'src/components/layout'
 import { CippLazy } from 'src/components/utilities'
 import { useNavigate } from 'react-router-dom'
 import useQuery from 'src/hooks/useQuery.jsx'
@@ -104,7 +104,7 @@ export default function CIPPExtensions() {
           <CTabPane key={`pane-${idx}`} visible={active === idx} className="mt-3">
             <CippLazy visible={active === idx}>
               <CRow className="mb-3">
-                <CCol md={4}>
+                <CCol sm={12} md={integration.mappingRequired ? 4 : 12} className="mb-3">
                   <CippButtonCard
                     title={integration.name}
                     titleType="big"
@@ -158,9 +158,29 @@ export default function CIPPExtensions() {
                         )
                       }}
                     />
+                    {extensionConfigResult?.data?.Results && (
+                      <CippCallout color={extensionConfigResult.isSuccess ? 'success' : 'danger'}>
+                        {extensionConfigResult?.data?.Results}
+                      </CippCallout>
+                    )}
+                    {listExtensionTestResult?.data?.Results && (
+                      <CippCallout color={listExtensionTestResult.isSuccess ? 'success' : 'danger'}>
+                        {listExtensionTestResult?.data?.Results}
+                        {listExtensionTestResult?.data?.Link && (
+                          <a
+                            href={listExtensionTestResult?.data?.Link}
+                            target="_blank"
+                            rel="noreferrer"
+                            className="ms-2"
+                          >
+                            Link
+                          </a>
+                        )}
+                      </CippCallout>
+                    )}
                   </CippButtonCard>
                 </CCol>
-                <CCol md={8}>
+                <CCol sm={12} md={8}>
                   <SettingsExtensionMappings type={integration.type} />
                 </CCol>
               </CRow>
diff --git a/src/views/cipp/Scheduler.jsx b/src/views/cipp/Scheduler.jsx
index 7ffed5837fe0..e0fd1aea974a 100644
--- a/src/views/cipp/Scheduler.jsx
+++ b/src/views/cipp/Scheduler.jsx
@@ -5,6 +5,7 @@ import { Field, Form, FormSpy } from 'react-final-form'
 import {
   RFFCFormInput,
   RFFCFormInputArray,
+  RFFCFormInputList,
   RFFCFormSwitch,
   RFFSelectSearch,
 } from 'src/components/forms'
@@ -157,10 +158,14 @@ const Scheduler = () => {
       if (typeof row?.Parameters[key] === 'object') {
         var nestedParamList = []
         Object.keys(row?.Parameters[key]).forEach((nestedKey) => {
-          nestedParamList.push({
-            Key: nestedKey,
-            Value: row?.Parameters[key][nestedKey],
-          })
+          if (nestedKey >= 0) {
+            nestedParamList.push(row?.Parameters[key][nestedKey])
+          } else {
+            nestedParamList.push({
+              Key: nestedKey,
+              Value: row?.Parameters[key][nestedKey],
+            })
+          }
         })
         parameters[key] = nestedParamList
       } else {
@@ -179,6 +184,10 @@ const Scheduler = () => {
       })
     })
 
+    if (!recurrence) {
+      recurrence = { name: 'Only once', value: '0' }
+    }
+
     // Set initial values
     var formValues = {
       taskName: row.Name,
@@ -413,12 +422,22 @@ const Scheduler = () => {
                                                 key={idx}
                                               />
                                             ) : (
-                                              <RFFCFormInput
-                                                type="text"
-                                                key={idx}
-                                                name={`parameters.${param.Name}`}
-                                                label={`${param.Name}`}
-                                              />
+                                              <>
+                                                {param.Type === 'System.String[]' ? (
+                                                  <RFFCFormInputList
+                                                    name={`parameters.${param.Name}[]`}
+                                                    label={`${param.Name}`}
+                                                    key={idx}
+                                                  />
+                                                ) : (
+                                                  <RFFCFormInput
+                                                    type="text"
+                                                    key={idx}
+                                                    name={`parameters.${param.Name}`}
+                                                    label={`${param.Name}`}
+                                                  />
+                                                )}
+                                              </>
                                             )}
                                           </>
                                         )}
diff --git a/src/views/cipp/app-settings/CIPPSettings.jsx b/src/views/cipp/app-settings/CIPPSettings.jsx
index 14e5c3e0cb9e..5a610170e49b 100644
--- a/src/views/cipp/app-settings/CIPPSettings.jsx
+++ b/src/views/cipp/app-settings/CIPPSettings.jsx
@@ -8,9 +8,7 @@ import { SettingsTenants } from 'src/views/cipp/app-settings/SettingsTenants.jsx
 import { SettingsBackend } from 'src/views/cipp/app-settings/SettingsBackend.jsx'
 import { SettingsNotifications } from 'src/views/cipp/app-settings/SettingsNotifications.jsx'
 import { SettingsLicenses } from 'src/views/cipp/app-settings/SettingsLicenses.jsx'
-import { SettingsExtensions } from 'src/views/cipp/app-settings/SettingsExtensions.jsx'
 import { SettingsMaintenance } from 'src/views/cipp/app-settings/SettingsMaintenance.jsx'
-import { SettingsExtensionMappings } from 'src/views/cipp/app-settings/SettingsExtensionMappings.jsx'
 import { SettingsPartner } from 'src/views/cipp/app-settings/SettingsPartner.jsx'
 import useQuery from 'src/hooks/useQuery.jsx'
 import { SettingsSuperAdmin } from './SettingsSuperAdmin.jsx'
diff --git a/src/views/cipp/app-settings/components/SettingsCustomRoles.jsx b/src/views/cipp/app-settings/components/SettingsCustomRoles.jsx
index 75c0a7504487..5799c900323f 100644
--- a/src/views/cipp/app-settings/components/SettingsCustomRoles.jsx
+++ b/src/views/cipp/app-settings/components/SettingsCustomRoles.jsx
@@ -13,20 +13,20 @@ import {
 import { Field, Form, FormSpy } from 'react-final-form'
 import { RFFCFormRadioList, RFFSelectSearch } from 'src/components/forms'
 import { useGenericGetRequestQuery, useLazyGenericPostRequestQuery } from 'src/store/api/app'
-import { CippPage } from 'src/components/layout'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import Skeleton from 'react-loading-skeleton'
 import { TenantSelectorMultiple, ModalService, CippOffcanvas } from 'src/components/utilities'
 import PropTypes from 'prop-types'
 import { OnChange } from 'react-final-form-listeners'
 import { useListTenantsQuery } from 'src/store/api/tenants'
-import CippListOffcanvas, { OffcanvasListSection } from 'src/components/utilities/CippListOffcanvas'
+import { OffcanvasListSection } from 'src/components/utilities/CippListOffcanvas'
 import CippButtonCard from 'src/components/contentcards/CippButtonCard'
 
 const SettingsCustomRoles = () => {
   const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
   const [selectedTenant, setSelectedTenant] = useState([])
+  const [blockedTenants, setBlockedTenants] = useState([])
   const tenantSelectorRef = useRef()
+  const blockedTenantSelectorRef = useRef()
   const { data: tenants = [], tenantsFetching } = useListTenantsQuery({
     showAllTenantSelector: true,
   })
@@ -57,13 +57,21 @@ const SettingsCustomRoles = () => {
         alltenant = true
       }
     })
-    if (alltenant) {
+    if (alltenant && blockedTenants.length === 0) {
       setAllTenantSelected(true)
     } else {
       setAllTenantSelected(false)
     }
     setSelectedTenant(e)
   }
+
+  const handleBlockedTenantChange = (e) => {
+    setBlockedTenants(e)
+    if (e.length > 0) {
+      setAllTenantSelected(false)
+    }
+  }
+
   const handleSubmit = async (values) => {
     //filter on only objects that are 'true'
     genericPostRequest({
@@ -72,6 +80,7 @@ const SettingsCustomRoles = () => {
         RoleName: values.RoleName.value,
         Permissions: values.Permissions,
         AllowedTenants: selectedTenant.map((tenant) => tenant.value),
+        BlockedTenants: blockedTenants.map((tenant) => tenant.value),
       },
     }).then(() => {
       refetchCustomRoleList()
@@ -119,17 +128,30 @@ const SettingsCustomRoles = () => {
                   } else {
                     if (set === 'AllowedTenants') {
                       setSelectedTenant(customRole[0][set])
-                      var selectedTenants = []
+                      var selectedTenantList = []
+                      tenants.map((tenant) => {
+                        if (customRole[0][set].includes(tenant.customerId)) {
+                          selectedTenantList.push({
+                            label: tenant.displayName,
+                            value: tenant.customerId,
+                          })
+                        }
+                      })
+
+                      tenantSelectorRef.current.setValue(selectedTenantList)
+                    } else if (set === 'BlockedTenants') {
+                      setBlockedTenants(customRole[0][set])
+                      var blockedTenantList = []
                       tenants.map((tenant) => {
                         if (customRole[0][set].includes(tenant.customerId)) {
-                          selectedTenants.push({
+                          blockedTenantList.push({
                             label: tenant.displayName,
                             value: tenant.customerId,
                           })
                         }
                       })
 
-                      tenantSelectorRef.current.setValue(selectedTenants)
+                      blockedTenantSelectorRef.current.setValue(blockedTenantList)
                     } else {
                       onChange(customRole[0][set])
                     }
@@ -277,6 +299,7 @@ const SettingsCustomRoles = () => {
                         />
                         <WhenFieldChanges field="RoleName" set="Permissions" />
                         <WhenFieldChanges field="RoleName" set="AllowedTenants" />
+                        <WhenFieldChanges field="RoleName" set="BlockedTenants" />
                         {cippApiRoleSelected && (
                           <CCallout color="info">
                             This role will limit access for the CIPP-API integration. It is not
@@ -299,6 +322,17 @@ const SettingsCustomRoles = () => {
                           </CCallout>
                         )}
                       </div>
+                      <div className="mb-3">
+                        <h5>Blocked Tenants</h5>
+                        <TenantSelectorMultiple
+                          ref={blockedTenantSelectorRef}
+                          values={blockedTenants}
+                          AllTenants={false}
+                          valueIsDomain={true}
+                          onChange={(e) => handleBlockedTenantChange(e)}
+                        />
+                      </div>
+
                       <h5>API Permissions</h5>
                       <CRow className="mt-4 px-2">
                         <CCol md={4}>
@@ -366,7 +400,7 @@ const SettingsCustomRoles = () => {
                             <>
                               {values['RoleName'] && selectedTenant.length > 0 && (
                                 <>
-                                  <h5>Selected Tenants</h5>
+                                  <h5>Allowed Tenants</h5>
                                   <ul>
                                     {selectedTenant.map((tenant, idx) => (
                                       <li key={idx}>{tenant.label}</li>
@@ -374,18 +408,30 @@ const SettingsCustomRoles = () => {
                                   </ul>
                                 </>
                               )}
+                              {values['RoleName'] && blockedTenants.length > 0 && (
+                                <>
+                                  <h5>Blocked Tenants</h5>
+                                  <ul>
+                                    {blockedTenants.map((tenant, idx) => (
+                                      <li key={idx}>{tenant.label}</li>
+                                    ))}
+                                  </ul>
+                                </>
+                              )}
                               {values['RoleName'] && values['Permissions'] && (
                                 <>
                                   <h5>Selected Permissions</h5>
                                   <ul>
                                     {values['Permissions'] &&
-                                      Object.keys(values['Permissions'])?.map((cat, idx) => (
-                                        <>
-                                          {!values['Permissions'][cat].includes('None') && (
-                                            <li key={idx}>{values['Permissions'][cat]}</li>
-                                          )}
-                                        </>
-                                      ))}
+                                      Object.keys(values['Permissions'])
+                                        ?.sort()
+                                        .map((cat, idx) => (
+                                          <>
+                                            {!values['Permissions'][cat].includes('None') && (
+                                              <li key={idx}>{values['Permissions'][cat]}</li>
+                                            )}
+                                          </>
+                                        ))}
                                   </ul>
                                 </>
                               )}
diff --git a/src/views/endpoint/autopilot/AutopilotAddProfile.jsx b/src/views/endpoint/autopilot/AutopilotAddProfile.jsx
index 62c62c8b4cf4..0dc6e02636cf 100644
--- a/src/views/endpoint/autopilot/AutopilotAddProfile.jsx
+++ b/src/views/endpoint/autopilot/AutopilotAddProfile.jsx
@@ -6,8 +6,9 @@ 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 { RFFCFormInput, RFFCFormSwitch } from 'src/components/forms'
+import { RFFCFormInput, RFFCFormSwitch, RFFSelectSearch } from 'src/components/forms'
 import { useLazyGenericPostRequestQuery } from 'src/store/api/app'
+import langaugeList from 'src/data/languageList'
 
 const Error = ({ name }) => (
   <Field
@@ -112,7 +113,20 @@ const ApplyStandard = () => {
             </CCol>
           </CRow>
           <CRow>
-            <CCol md={12}>
+            <CCol md={12} className="mb-2">
+              <RFFSelectSearch
+                values={langaugeList.map(({ language, tag }) => ({
+                  value: tag,
+                  name: language,
+                }))}
+                name="languages"
+                multi={false}
+                label="Languages"
+              />
+            </CCol>
+          </CRow>
+          <CRow>
+            <CCol md={12} className="mb-2">
               <RFFCFormInput
                 type="text"
                 name="Description"
@@ -122,41 +136,44 @@ const ApplyStandard = () => {
             </CCol>
           </CRow>
           <CRow>
-            <CCol md={12}>
+            <CCol md={12} className="mb-2">
               <RFFCFormInput
                 type="text"
                 name="DeviceNameTemplate"
                 label="Unique name template"
                 placeholder="leave blank for none"
               />
-              <br></br>
             </CCol>
           </CRow>
-          <RFFCFormSwitch
-            value={true}
-            name="CollectHash"
-            label="Convert all targeted devices to Autopilot"
-          />
-          <RFFCFormSwitch value={true} name="Assignto" label="Assign to all devices" />
-          <RFFCFormSwitch value={true} name="DeploymentMode" label="Self-deploying mode" />
-          <RFFCFormSwitch value={true} name="HideTerms" label="Hide Terms and conditions" />
-          <RFFCFormSwitch value={true} name="HidePrivacy" label="Hide Privacy Settings" />
-          <RFFCFormSwitch
-            value={true}
-            name="HideChangeAccount"
-            label="Hide Change Account Options"
-          />
-          <RFFCFormSwitch
-            value={true}
-            name="NotLocalAdmin"
-            label="Setup user as standard user (Leave unchecked to setup user as local admin)"
-          />
-          <RFFCFormSwitch value={true} name="allowWhiteglove" label="Allow White Glove OOBE" />
-          <RFFCFormSwitch
-            value={true}
-            name="Autokeyboard"
-            label="Automatically configure keyboard"
-          />
+          <CRow>
+            <CCol md={12} className="mb-2">
+              <RFFCFormSwitch
+                value={true}
+                name="CollectHash"
+                label="Convert all targeted devices to Autopilot"
+              />
+              <RFFCFormSwitch value={true} name="Assignto" label="Assign to all devices" />
+              <RFFCFormSwitch value={true} name="DeploymentMode" label="Self-deploying mode" />
+              <RFFCFormSwitch value={true} name="HideTerms" label="Hide Terms and conditions" />
+              <RFFCFormSwitch value={true} name="HidePrivacy" label="Hide Privacy Settings" />
+              <RFFCFormSwitch
+                value={true}
+                name="HideChangeAccount"
+                label="Hide Change Account Options"
+              />
+              <RFFCFormSwitch
+                value={true}
+                name="NotLocalAdmin"
+                label="Setup user as standard user (Leave unchecked to setup user as local admin)"
+              />
+              <RFFCFormSwitch value={true} name="allowWhiteglove" label="Allow White Glove OOBE" />
+              <RFFCFormSwitch
+                value={true}
+                name="Autokeyboard"
+                label="Automatically configure keyboard"
+              />
+            </CCol>
+          </CRow>
         </CForm>
         <hr className="my-4" />
       </CippWizard.Page>
diff --git a/src/views/tenant/standards/ListAppliedStandards.jsx b/src/views/tenant/standards/ListAppliedStandards.jsx
index c48dd3705753..6548ebb25848 100644
--- a/src/views/tenant/standards/ListAppliedStandards.jsx
+++ b/src/views/tenant/standards/ListAppliedStandards.jsx
@@ -42,6 +42,7 @@ import GDAPRoles from 'src/data/GDAPRoles'
 import timezoneList from 'src/data/timezoneList'
 import Select from 'react-select'
 import { cellGenericFormatter } from 'src/components/tables/CellGenericFormat'
+import langaugeList from 'src/data/languageList'
 
 const DeleteAction = () => {
   const tenantDomain = useSelector((state) => state.app.currentTenant.defaultDomainName)
@@ -875,6 +876,19 @@ const ApplyNewStandard = () => {
                                     />
                                     <br></br>
                                   </CCol>
+                                  <CRow>
+                                    <CCol md={12} className="mb-2">
+                                      <RFFSelectSearch
+                                        values={langaugeList.map(({ language, tag }) => ({
+                                          value: tag,
+                                          name: language,
+                                        }))}
+                                        name="standards.APConfig.languages"
+                                        multi={false}
+                                        label="Languages"
+                                      />
+                                    </CCol>
+                                  </CRow>
                                 </CRow>
                                 <RFFCFormSwitch
                                   value={true}