diff --git a/new-lamassu-admin/src/pages/Locales/Locales.js b/new-lamassu-admin/src/pages/Locales/Locales.js
index a2fb75a4..991c313e 100644
--- a/new-lamassu-admin/src/pages/Locales/Locales.js
+++ b/new-lamassu-admin/src/pages/Locales/Locales.js
@@ -58,6 +58,7 @@ const Locales = ({ name: SCREEN_KEY }) => {
   const config = data?.config && fromNamespace(SCREEN_KEY)(data.config)
 
   const locale = config && !R.isEmpty(config) ? config : localeDefaults
+  const localeOverrides = locale.overrides ?? []
 
   const save = it => {
     const config = toNamespace(SCREEN_KEY)(it.locale[0])
@@ -69,18 +70,6 @@ const Locales = ({ name: SCREEN_KEY }) => {
     return saveConfig({ variables: { config } })
   }
 
-  const removeOverridenMachines = data => {
-    if (data) {
-      const overridenMachines = locale.overrides?.map(o => o.machine)
-      const machinesIndex = data.findIndex(o => o.name === 'machine')
-      data[machinesIndex].inputProps.options = data[
-        machinesIndex
-      ].inputProps.options?.filter(m => !overridenMachines.includes(m.deviceId))
-    }
-
-    return data
-  }
-
   return (
     <>
       <TitleSection title="Locales" />
@@ -108,8 +97,8 @@ const Locales = ({ name: SCREEN_KEY }) => {
           initialValues={overridesDefaults}
           save={saveOverrides}
           validationSchema={OverridesSchema}
-          data={locale.overrides ?? []}
-          elements={removeOverridenMachines(overrides(data))}
+          data={localeOverrides}
+          elements={overrides(data, localeOverrides)}
         />
       </Section>
     </>
diff --git a/new-lamassu-admin/src/pages/Locales/helper.js b/new-lamassu-admin/src/pages/Locales/helper.js
index 0b539cb9..bf560e73 100644
--- a/new-lamassu-admin/src/pages/Locales/helper.js
+++ b/new-lamassu-admin/src/pages/Locales/helper.js
@@ -5,11 +5,14 @@ import Autocomplete from 'src/components/inputs/formik/Autocomplete.js'
 
 const LANGUAGE_SELECTION_LIMIT = 4
 
-const getFields = (getData, names) => {
-  return R.filter(it => R.includes(it.name, names), allFields(getData))
+const getFields = (getData, names, auxElements = []) => {
+  return R.filter(
+    it => R.includes(it.name, names),
+    allFields(getData, auxElements)
+  )
 }
 
-const allFields = getData => {
+const allFields = (getData, auxElements = []) => {
   const getView = (data, code, compare) => it => {
     if (!data) return ''
 
@@ -19,12 +22,26 @@ const allFields = getData => {
     )(data)
   }
 
+  const findSuggestion = (it, machines) => {
+    const machine = R.compose(R.find(R.propEq('deviceId', it?.machine)))(
+      machines
+    )
+    return machine ? [machine] : []
+  }
+
   const displayCodeArray = data => it => {
     if (!it) return it
 
     return R.compose(R.join(', '), R.map(getView(data, 'code')))(it)
   }
 
+  const overridenMachines = R.map(override => override.machine, auxElements)
+  const suggestionFilter = R.filter(
+    it => !R.contains(it.deviceId, overridenMachines)
+  )
+
+  console.log(getData(['machines']))
+
   const machineData = getData(['machines'])
   const countryData = getData(['countries'])
   const currencyData = getData(['currencies'])
@@ -38,7 +55,11 @@ const allFields = getData => {
       view: getView(machineData, 'name', 'deviceId'),
       input: Autocomplete,
       inputProps: {
-        options: machineData,
+        options: it =>
+          R.concat(
+            suggestionFilter(machineData),
+            findSuggestion(it, machineData)
+          ),
         valueProp: 'deviceId',
         getLabel: R.path(['name']),
         limit: null
@@ -110,15 +131,14 @@ const mainFields = auxData => {
   ])
 }
 
-const overrides = auxData => {
+const overrides = (auxData, auxElements) => {
   const getData = R.path(R.__, auxData)
 
-  return getFields(getData, [
-    'machine',
-    'country',
-    'languages',
-    'cryptoCurrencies'
-  ])
+  return getFields(
+    getData,
+    ['machine', 'country', 'languages', 'cryptoCurrencies'],
+    auxElements
+  )
 }
 
 const LocaleSchema = Yup.object().shape({