diff --git a/LedgerSMB.pm b/LedgerSMB.pm
index 4b8ff4965..52dae7c35 100755
--- a/LedgerSMB.pm
+++ b/LedgerSMB.pm
@@ -351,7 +351,8 @@ sub format_amount {
 
         if ( $dash eq "0" && $places ) {
 
-            if ( $myconfig->{numberformat} eq '1.000,00' ) {
+            #if ( $myconfig->{numberformat} eq '1.000,00' ) {
+            if ( $myconfig->{numberformat} =~ /0,00$/ ) {
                 $amount = "0" . "," . "0" x $places;
             }
             else {
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index 13f2f34ae..81a9efe17 100644
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -501,7 +501,7 @@ sub format_amount {
 
         if ( $dash eq "0" && $places ) {
 
-            if ( $myconfig->{numberformat} eq '1.000,00' ) {
+            if ( $myconfig->{numberformat} =~ /0,00$/ ) {
                 $amount = "0" . "," . "0" x $places;
             }
             else {