diff --git a/budget_edit_modal.php b/budget_edit_modal.php
index c17d9536..b86f24f5 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 $budget_amount; ?>" placeholder="0.00" required>
+                                <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, '.', ''); ?>" placeholder="0.00" required>
                             </div>
                         </div>
 
diff --git a/client_edit_modal.php b/client_edit_modal.php
index f5ae5d7a..d2ee6917 100644
--- a/client_edit_modal.php
+++ b/client_edit_modal.php
@@ -129,7 +129,7 @@
                                         </div>
                                         <input type="text" class="form-control" inputmode="numeric"
                                             pattern="[0-9]*\.?[0-9]{0,2}" name="rate" placeholder="0.00"
-                                            value="<?php echo $client_rate; ?>">
+                                            value="<?php echo number_format($client_rate, 2, '.', ''); ?>">
                                     </div>
                                 </div>
 
diff --git a/expense_copy_modal.php b/expense_copy_modal.php
index 8e6273be..64351a67 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 $expense_amount; ?>" placeholder="0.00" required>
+                                <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>
                             </div>
                         </div>
 
diff --git a/expense_edit_modal.php b/expense_edit_modal.php
index 1ef68edc..528e2904 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 $expense_amount; ?>" placeholder="0.00" required>
+                                <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>
                             </div>
                         </div>
 
diff --git a/expense_refund_modal.php b/expense_refund_modal.php
index d3414562..aa7e82e6 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 $expense_amount; ?>" placeholder="-0.00" required>
+                                <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>
                             </div>
                         </div>
                     </div>
diff --git a/invoice_edit_modal.php b/invoice_edit_modal.php
index abc451b7..879d04d5 100644
--- a/invoice_edit_modal.php
+++ b/invoice_edit_modal.php
@@ -67,7 +67,7 @@
                             <div class='input-group-prepend'>
                                 <span class='input-group-text'><i class='fa fa-fw fa-dollar-sign'></i></span>
                             </div>
-                            <input type='number' class='form-control' step="0.01" name='invoice_discount' placeholder='Discount Amount' value='<?php echo $invoice_discount; ?>'>
+                            <input type='text' class='form-control' inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name='invoice_discount' placeholder='0.00' value="<?php echo number_format($invoice_discount, 2, '.', ''); ?>">
                         </div>
                     </div>
 
diff --git a/invoice_payment_add_modal.php b/invoice_payment_add_modal.php
index 7672edf1..a7aa2a41 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 $balance; ?>" placeholder="0.00" required>
+                                    <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>
                                 </div>
                             </div>
 
diff --git a/item_edit_modal.php b/item_edit_modal.php
index 21797af1..136f974f 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 $item_price; ?>" placeholder="0.00" required>
+                  <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>
                 </div>
               </div>
             
diff --git a/product_edit_modal.php b/product_edit_modal.php
index af9b20f8..e1df979a 100644
--- a/product_edit_modal.php
+++ b/product_edit_modal.php
@@ -55,7 +55,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" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" class="form-control" name="price" value="<?php echo $product_price; ?>" placeholder="0.00" required>
+                                    <input type="text" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" class="form-control" name="price" value="<?php echo number_format($product_price, 2, '.', ''); ?>" placeholder="0.00" required>
                                 </div>
                             </div>
                         </div>
diff --git a/quote_edit_modal.php b/quote_edit_modal.php
index 5188b69d..6e7c12de 100644
--- a/quote_edit_modal.php
+++ b/quote_edit_modal.php
@@ -54,7 +54,7 @@
                             <div class='input-group-prepend'>
                                 <span class='input-group-text'><i class='fa fa-fw fa-dollar-sign'></i></span>
                             </div>
-                            <input type='number' class='form-control' step="0.01" name='quote_discount' placeholder='Discount Amount' value='<?php echo $quote_discount; ?>'>
+                            <input type='text' class='form-control' inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name='quote_discount' placeholder='0.00' value='<?php echo <?php echo number_format($quote_discount, 2, '.', ''); ?>; ?>'>
                         </div>
                     </div>
 
diff --git a/recurring_expense_edit_modal.php b/recurring_expense_edit_modal.php
index cedcd108..9318825f 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="-?[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo $recurring_expense_amount; ?>" required>
+                                <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($recurring_expense_amount, 2, '.', ''); ?>" required>
                             </div>
                         </div>
                     </div>
diff --git a/recurring_invoice_edit_modal.php b/recurring_invoice_edit_modal.php
index 42654ec9..6e46562d 100644
--- a/recurring_invoice_edit_modal.php
+++ b/recurring_invoice_edit_modal.php
@@ -86,7 +86,7 @@
                             <div class='input-group-prepend'>
                                 <span class='input-group-text'><i class='fa fa-fw fa-dollar-sign'></i></span>
                             </div>
-                            <input type='number' class='form-control' name='recurring_discount' placeholder='Discount Amount' value='<?php echo $recurring_discount; ?>'>
+                            <input type='text' class='form-control' inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name='recurring_discount' placeholder='0.00' value="<?php echo number_format($recurring_discount, 2, '.', ''); ?>">
                         </div>
                     </div>
 
diff --git a/revenue_edit_modal.php b/revenue_edit_modal.php
index d439d0e0..4a372c89 100644
--- a/revenue_edit_modal.php
+++ b/revenue_edit_modal.php
@@ -44,7 +44,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 $revenue_amount; ?>" placeholder="0.00" required>
+                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($revenue_amount, 2, '.', ''); ?>" placeholder="0.00" required>
                             </div>
                         </div>
 
diff --git a/ticket_invoice_add_modal.php b/ticket_invoice_add_modal.php
index 45a4a765..cf7f6f4e 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 $client_rate; ?>" required>
+                                    <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>
                                 </div>
                             </div>
 
diff --git a/transfer_edit_modal.php b/transfer_edit_modal.php
index b281b359..a32b5593 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 $transfer_amount; ?>" required>
+                                <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>
                             </div>
                         </div>