diff --git a/client/src/i18n/en/exchange.json b/client/src/i18n/en/exchange.json
index e80f0e9521..aa08d1f3c9 100644
--- a/client/src/i18n/en/exchange.json
+++ b/client/src/i18n/en/exchange.json
@@ -3,6 +3,7 @@
     "ADDING_RATE" : "Adding an exchange Rate",
     "ADD_MISSING_RATES_FOR": "Please add missing exchange rates for:",
     "AT_THE_DATE": "at the date",
+    "CURRENCY_NOT_SUPPORTED": "Currency not supported ",
     "CLICK_HERE_TO_FIX_RATES": "Click here to set missing currency exchange rates",
     "CURRENT_RATE" : "Current Exchange Rate",
     "DEFINE_EXCHANGE_RATE": "Please define the exchange rate for: {{name}} ({{symbol}})!",
@@ -11,6 +12,7 @@
     "EXCHANGE_RATES" : "Exchange Rate(s)",
     "FIX_MISSING_RATES_FIRST": "You must fix missing exchange rates before proceeding!",
     "FOR" : "for",
+    "INVALID_CURRENCY_DEFINITION": "Invalid currency definition! ",
     "INVOICE_DISCLAIMER" : "Exchange rate based on the latest enterprise exchange:",
     "MISSING_EXCHANGE_RATES": "The exchange for some currencies have not be defined!",
     "MUST_DEFINE_RATES_FIRST": "The exchange rates for all currencies be defined first!",
diff --git a/client/src/i18n/fr/exchange.json b/client/src/i18n/fr/exchange.json
index 5b01d401c3..65ab505614 100644
--- a/client/src/i18n/fr/exchange.json
+++ b/client/src/i18n/fr/exchange.json
@@ -3,6 +3,7 @@
     "ADDING_RATE" : "Ajouter un taux de change",
     "ADD_MISSING_RATES_FOR": "Veuillez ajouter les taux de change manquants pour :",
     "AT_THE_DATE": "à la date",
+    "CURRENCY_NOT_SUPPORTED": "Monnaie non supportée ",
     "CLICK_HERE_TO_FIX_RATES": "Cliquez ici pour définir les taux de change manquants",
     "CURRENT_RATE" : "Taux de change actuel",
     "DEFINE_EXCHANGE_RATE": "Veuillez définir le taux de change pour : {{name}} ({{symbol}})!",
@@ -11,6 +12,7 @@
     "EXCHANGE_RATES" : "le taux de change",
     "FIX_MISSING_RATES_FIRST": "Vous devez fixer les taux de change manquants avant de poursuivre !",
     "FOR" : "pour",
+    "INVALID_CURRENCY_DEFINITION": "Définition de la monnaie non valide ! ",
     "INVOICE_DISCLAIMER" : "Taux de Change basé sur le dernier taux de l'entreprise",
     "MISSING_EXCHANGE_RATES": "Les taux de change de certaines monnaies n'ont pas été définis !",
     "MUST_DEFINE_RATES_FIRST": "Les taux de change de toutes les monnaies doivent d'abord être définis !",
diff --git a/client/src/js/filters/currency.js b/client/src/js/filters/currency.js
index 7a26f4a995..2ead78b2a9 100644
--- a/client/src/js/filters/currency.js
+++ b/client/src/js/filters/currency.js
@@ -28,7 +28,7 @@ function CurrencyFilter(CurrencyFormat, Session) {
     if (angular.isUndefined(currencyId)) {
 
       if (requireCurrencyDefinition) {
-        return formatError('INVALID_CURRENCY_DEFINITION', amount);
+        return formatError('EXCHANGE.INVALID_CURRENCY_DEFINITION', amount);
       } else {
 
         // Display enterprise currency unless otherwise specified
@@ -55,7 +55,7 @@ function CurrencyFilter(CurrencyFormat, Session) {
 
     // Currency ID did not match a currency ID or format configuration was not found
     if (!formatConfiguration.supported) {
-      return formatError('CURRENCY_NOT_SUPPORTED', amount);
+      return formatError('EXCHANGE.CURRENCY_NOT_SUPPORTED', amount);
     }
 
     return formatNumber(amount, formatConfiguration.PATTERNS[1], formatConfiguration.GROUP_SEP, formatConfiguration.DECIMAL_SEP)