diff --git a/budget_edit_modal.php b/budget_edit_modal.php
index 913096bc..c17d9536 100644
--- a/budget_edit_modal.php
+++ b/budget_edit_modal.php
@@ -62,7 +62,7 @@
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                                 </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($budget_amount,2); ?>" required>
+                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo $budget_amount; ?>" placeholder="0.00" required>
                             </div>
                         </div>
 
diff --git a/expense_copy_modal.php b/expense_copy_modal.php
index ab69b03b..8e6273be 100644
--- a/expense_copy_modal.php
+++ b/expense_copy_modal.php
@@ -27,7 +27,7 @@
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                                 </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($expense_amount,2); ?>" placeholder="0.00" required>
+                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo $expense_amount; ?>" placeholder="0.00" required>
                             </div>
                         </div>
 
diff --git a/expense_edit_modal.php b/expense_edit_modal.php
index 4140254c..1ef68edc 100644
--- a/expense_edit_modal.php
+++ b/expense_edit_modal.php
@@ -29,7 +29,7 @@
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                                 </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($expense_amount,2); ?>" placeholder="0.00" required>
+                                <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo $expense_amount; ?>" placeholder="0.00" required>
                             </div>
                         </div>
 
diff --git a/expense_refund_modal.php b/expense_refund_modal.php
index c35cba77..d3414562 100644
--- a/expense_refund_modal.php
+++ b/expense_refund_modal.php
@@ -31,7 +31,7 @@
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                                 </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" value="-<?php echo number_format($expense_amount,2); ?>" placeholder="-0.00" required>
+                                <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" value="-<?php echo $expense_amount; ?>" placeholder="-0.00" required>
                             </div>
                         </div>
                     </div>
diff --git a/invoice_payment_add_modal.php b/invoice_payment_add_modal.php
index 7a25845d..7672edf1 100644
--- a/invoice_payment_add_modal.php
+++ b/invoice_payment_add_modal.php
@@ -36,7 +36,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                                     </div>
-                                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($balance, 2); ?>" placeholder="0.00" required>
+                                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo $balance; ?>" placeholder="0.00" required>
                                 </div>
                             </div>
 
diff --git a/item_edit_modal.php b/item_edit_modal.php
index b623e1b2..21797af1 100644
--- a/item_edit_modal.php
+++ b/item_edit_modal.php
@@ -52,7 +52,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                   </div>
-                  <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="price" value="<?php echo number_format($item_price,2); ?>" placeholder="0.00" required>
+                  <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="price" value="<?php echo $item_price; ?>" placeholder="0.00" required>
                 </div>
               </div>
             
diff --git a/recurring_expense_create_modal.php b/recurring_expense_create_modal.php
index b3b9be43..ba1f110c 100644
--- a/recurring_expense_create_modal.php
+++ b/recurring_expense_create_modal.php
@@ -68,7 +68,7 @@
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                                 </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="^(?:\d{1,3}(?:,\d{3})*|\d+)(?:\.\d{0,2})?$" name="amount" placeholder="0.00" required>
+                                <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
                             </div>
                         </div>
                     </div>
diff --git a/recurring_expense_edit_modal.php b/recurring_expense_edit_modal.php
index 48b5fc85..cedcd108 100644
--- a/recurring_expense_edit_modal.php
+++ b/recurring_expense_edit_modal.php
@@ -69,7 +69,7 @@
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                                 </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="^(?:\d{1,3}(?:,\d{3})*|\d+)(?:\.\d{0,2})?$" name="amount" value="<?php echo number_format($recurring_expense_amount,2); ?>" required>
+                                <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo $recurring_expense_amount; ?>" required>
                             </div>
                         </div>
                     </div>
diff --git a/revenues.php b/revenues.php
index e56d00b6..6ff78a1c 100644
--- a/revenues.php
+++ b/revenues.php
@@ -105,7 +105,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     }
                     $revenue_date = nullable_htmlentities($row['revenue_date']);
                     $revenue_payment_method = nullable_htmlentities($row['revenue_payment_method']);
-                    $revenue_amount = number_format(floatval($row['revenue_amount']),2);
+                    $revenue_amount = floatval($row['revenue_amount']);
                     $revenue_currency_code = nullable_htmlentities($row['revenue_currency_code']);
                     $revenue_created_at = nullable_htmlentities($row['revenue_created_at']);
                     $account_id = intval($row['account_id']);
diff --git a/ticket_invoice_add_modal.php b/ticket_invoice_add_modal.php
index 5d74fe99..45a4a765 100644
--- a/ticket_invoice_add_modal.php
+++ b/ticket_invoice_add_modal.php
@@ -155,7 +155,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                                     </div>
-                                    <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="price" value="<?php echo number_format($client_rate,2); ?>" required>
+                                    <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="price" value="<?php echo $client_rate; ?>" required>
                                 </div>
                             </div>
 
diff --git a/transfer_edit_modal.php b/transfer_edit_modal.php
index 524997c5..b281b359 100644
--- a/transfer_edit_modal.php
+++ b/transfer_edit_modal.php
@@ -32,7 +32,7 @@
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                                 </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" value="<?php echo number_format($transfer_amount,2); ?>" required>
+                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" value="<?php echo $transfer_amount; ?>" required>
                             </div>
                         </div>