diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index af6c3ff65400a416a9f0bae99858ecaca901be6e..4999f7e5427b631a8e964a68791cba091a804376 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -583,7 +583,7 @@ class listform {
 					break;
 
 				case 'CURRENCY':
-					$record[$key] = str_replace(',', '.', $record[$key]);
+					$record[$key] = $app->functions->currency_unformat($record[$key]);
 					break;
 				
 				case 'BOOLEAN':
diff --git a/interface/lib/classes/tform_base.inc.php b/interface/lib/classes/tform_base.inc.php
index c911aa5bc4fd9380cab9a144fb3b1e94c7b69040..8bb8cb7b7dbb4e9fe907dac4ebbabf67f14d05c3 100644
--- a/interface/lib/classes/tform_base.inc.php
+++ b/interface/lib/classes/tform_base.inc.php
@@ -808,7 +808,7 @@ class tform_base {
 					$new_record[$key] = $record[$key];
 					break;
 				case 'CURRENCY':
-					$new_record[$key] = str_replace(",", ".", $record[$key]);
+					$new_record[$key] = $app->functions->currency_unformat($record[$key]);
 					break;
 
 				case 'DATETIME':