diff --git a/lib/options-loader.js b/lib/options-loader.js
index 81061d7c..29ec60ec 100644
--- a/lib/options-loader.js
+++ b/lib/options-loader.js
@@ -6,6 +6,8 @@ const _ = require('lodash/fp')
 
 require('dotenv').config()
 
+const DATABASE = process.env.LAMASSU_DB ?? 'DEV'
+
 const dbMapping = psqlConf => ({
   STRESS_TEST: _.replace('lamassu', 'lamassu_stress', psqlConf),
   RELEASE: _.replace('lamassu', 'lamassu_release', psqlConf),
@@ -39,7 +41,7 @@ function load () {
       opts: JSON.parse(fs.readFileSync(globalConfigPath))
     }
 
-    config.opts.postgresql = dbMapping(config.opts.postgresql)[process.env.LAMASSU_DB]
+    config.opts.postgresql = dbMapping(config.opts.postgresql)[DATABASE]
 
     return config
   } catch (_) {
@@ -50,7 +52,7 @@ function load () {
         opts: JSON.parse(fs.readFileSync(homeConfigPath))
       }
 
-      config.opts.postgresql = dbMapping(config.opts.postgresql)[process.env.LAMASSU_DB]
+      config.opts.postgresql = dbMapping(config.opts.postgresql)[DATABASE]
 
       return config
     } catch (_) {
diff --git a/new-lamassu-admin/src/pages/ATMWallet/ATMWallet.js b/new-lamassu-admin/src/pages/ATMWallet/ATMWallet.js
index 79b03c10..9c501948 100644
--- a/new-lamassu-admin/src/pages/ATMWallet/ATMWallet.js
+++ b/new-lamassu-admin/src/pages/ATMWallet/ATMWallet.js
@@ -51,6 +51,9 @@ const GET_OPERATOR_BY_USERNAME = gql`
   }
 `
 
+const formatCurrency = amount =>
+  amount.toLocaleString('en-US', { maximumFractionDigits: 2 })
+
 const CHIPS_PER_ROW = 6
 
 const Assets = ({ balance, wallets, currency }) => {
@@ -66,7 +69,7 @@ const Assets = ({ balance, wallets, currency }) => {
         <P className={classes.fieldHeader}>Available balance</P>
         <div className={classes.totalAssetWrapper}>
           <Info2 noMargin className={classes.fieldValue}>
-            {balance.toLocaleString('en-US', { maximumFractionDigits: 2 })}
+            {formatCurrency(balance)}
           </Info2>
           <Info2 noMargin className={classes.fieldCurrency}>
             {R.toUpper(currency)}
@@ -78,9 +81,7 @@ const Assets = ({ balance, wallets, currency }) => {
         <P className={classes.fieldHeader}>Total balance in wallets</P>
         <div className={classes.totalAssetWrapper}>
           <Info2 noMargin className={classes.fieldValue}>
-            {walletFiatSum().toLocaleString('en-US', {
-              maximumFractionDigits: 2
-            })}
+            {formatCurrency(walletFiatSum())}
           </Info2>
           <Info2 noMargin className={classes.fieldCurrency}>
             {R.toUpper(currency)}
@@ -92,7 +93,7 @@ const Assets = ({ balance, wallets, currency }) => {
         <P className={classes.fieldHeader}>Total assets</P>
         <div className={classes.totalAssetWrapper}>
           <Info2 noMargin className={classes.fieldValue}>
-            {balance.toLocaleString('en-US', { maximumFractionDigits: 2 })}
+            {formatCurrency(balance)}
           </Info2>
           <Info2 noMargin className={classes.fieldCurrency}>
             {R.toUpper(currency)}