diff --git a/lib/new-config-manager.js b/lib/new-config-manager.js
index 17a63adc..65c7966d 100644
--- a/lib/new-config-manager.js
+++ b/lib/new-config-manager.js
@@ -93,7 +93,7 @@ const getNotifications = (cryptoCurrency, machine, config) => {
   const findByMachine = _.find(_.matches({ machine }))
 
   const cryptoFields = ['cryptoHighBalance', 'cryptoLowBalance', 'highBalance', 'lowBalance']
-  const fiatFields = ['cashbox', 'fillingPercentageCassette1', 'fillingPercentageCassette2', 'fillingPercentageCassette3', 'fillingPercentageCassette4']
+  const fiatFields = ['cashInAlertThreshold', 'fillingPercentageCassette1', 'fillingPercentageCassette2', 'fillingPercentageCassette3', 'fillingPercentageCassette4']
 
   const getCryptoSettings = _.compose(_.pick(cryptoFields), _.defaultTo(notifications), findByCryptoCurrency)
   const cryptoSettings = getCryptoSettings(notifications.cryptoBalanceOverrides)
@@ -108,8 +108,11 @@ const getNotifications = (cryptoCurrency, machine, config) => {
     delete cryptoSettings.lowBalance
   }
 
-  const getFiatSettings = _.compose(_.pick(fiatFields), _.defaultTo(notifications), findByMachine)
-  const fiatSettings = getFiatSettings(notifications.fiatBalanceOverrides)
+  const fiatSettings = _.flow(
+    findByMachine,
+    _.assignWith(_.defaultTo, notifications),
+    _.pick(fiatFields),
+  )(notifications.fiatBalanceOverrides)
   return { ...notifNoOverrides, sms: smsSettings, email: emailSettings, ...cryptoSettings, ...fiatSettings, notificationCenter: notificationCenterSettings }
 }
 
diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js
index e7cfeb4c..98ef8fb4 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js
+++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js
@@ -10,7 +10,7 @@ import { transformNumber } from 'src/utils/number'
 
 import NotificationsCtx from '../NotificationsContext'
 
-const CASHBOX_KEY = 'cashbox'
+const CASHBOX_KEY = 'cashInAlertThreshold'
 const CASSETTE_1_KEY = 'fillingPercentageCassette1'
 const CASSETTE_2_KEY = 'fillingPercentageCassette2'
 const CASSETTE_3_KEY = 'fillingPercentageCassette3'