diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index b165707b17..bda5eba325 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -44,7 +44,11 @@ class Helper
     public static function formatCurrencyOutput($cost)
     {
         if (is_numeric($cost)) {
-            return number_format($cost, 2, '.', '');
+
+            if (Setting::getSettings()->digit_separator=='1.234,56') {
+                return number_format($cost, 2, ',', '.');
+            }
+            return number_format($cost, 2, '.', ',');
         }
         // It's already been parsed.
         return $cost;
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index c3bc23c69b..1a58a31ff6 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -145,7 +145,6 @@ class AssetPresenter extends Presenter
                 'searchable' => true,
                 'sortable' => true,
                 'title' => trans('general.purchase_cost'),
-                'formatter' => 'numberWithCommas',
                 'footerFormatter' => 'sumFormatter',
             ], [
                 'field' => 'order_number',
diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index ab87bf0e33..0f565cbe94 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -400,7 +400,7 @@ Form::macro('time_display_format', function ($name = 'time_display_format', $sel
 
 Form::macro('digit_separator', function ($name = 'digit_separator', $selected = null, $class = null) {
     $formats = [
-        '1234.56',
+        '1,234.56',
         '1.234,56',
     ];
 
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 13de846d39..15f0dd1e9f 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -608,9 +608,13 @@
 
     function numberWithCommas(value) {
         if ((value) && ("{{$snipeSettings->digit_separator}}" == "1.234,56")){
-        var parts = value.toString().split(".");
-        parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ".");
-        return parts.join(",");
+            var parts = value.toString().split(".");
+            parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ".");
+            return parts.join(",");
+        } else {
+            var parts = value.toString().split(",");
+            parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+            return parts.join(".");
         }
         return value
     }