diff --git a/src/components/forms/RFFComponents.jsx b/src/components/forms/RFFComponents.jsx
index b2a0f5472619..516098532900 100644
--- a/src/components/forms/RFFComponents.jsx
+++ b/src/components/forms/RFFComponents.jsx
@@ -546,7 +546,6 @@ export const RFFSelectSearch = ({
         }
 
         const selectProps = {
-          className: 'react-select-container',
           classNamePrefix: 'react-select',
           ...input,
           name,
@@ -560,6 +559,10 @@ export const RFFSelectSearch = ({
           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 (
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}