diff --git a/db.sql b/db.sql
index 8fcad57a..74cac331 100644
--- a/db.sql
+++ b/db.sql
@@ -638,6 +638,7 @@ CREATE TABLE `settings` (
   `config_default_transfer_to_account` int(11) DEFAULT NULL,
   `config_default_calendar` int(11) DEFAULT NULL,
   `config_default_net_terms` int(11) DEFAULT NULL,
+  `config_records_per_page` int(10) NOT NULL,
   `config_company_name` varchar(200) DEFAULT NULL,
   `config_company_country` varchar(200) DEFAULT NULL,
   `config_company_address` varchar(200) DEFAULT NULL,
@@ -881,4 +882,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-01-15 19:01:39
+-- Dump completed on 2021-01-15 20:10:13
diff --git a/get_settings.php b/get_settings.php
index 9fcbd57d..53d4ce90 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -50,6 +50,7 @@ $config_default_calendar = $row['config_default_calendar'];
 $config_default_payment_method = $row['config_default_payment_method'];
 $config_default_expense_payment_method = $row['config_default_expense_payment_method'];
 $config_default_net_terms = $row['config_default_net_terms'];
+$config_records_per_page = $row['config_records_per_page'];
 
 $config_recurring_auto_send_invoice = $row['config_recurring_auto_send_invoice'];
 
@@ -62,7 +63,7 @@ $config_aes_key = $row['config_aes_key'];
 $config_base_url = $row['config_base_url'];
 $config_enable_cron = $row['config_enable_cron'];
 
-$config_records_per_page = 20;
+
 
 $net_terms_array = array(
     '0'=>'On Reciept',
@@ -71,6 +72,8 @@ $net_terms_array = array(
     '30'=>'30 Days'    
 );
 
+$records_per_page_array = array('5','10','15','20','30','50','100');
+
 $states_array = array(
     'AL'=>'Alabama',
     'AK'=>'Alaska',
diff --git a/post.php b/post.php
index be0c6632..33a35133 100644
--- a/post.php
+++ b/post.php
@@ -144,7 +144,7 @@ if(isset($_POST['add_company'])){
     mkdir("uploads/settings/$company_id");
     mkdir("uploads/tmp/$company_id");
  
-    mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$name', config_company_country = '$country', config_company_address = '$address', config_company_city = '$city', config_company_state = '$state', config_company_zip = '$zip', config_company_phone = '$phone', config_company_site = '$site', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1");
+    mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$name', config_company_country = '$country', config_company_address = '$address', config_company_city = '$city', config_company_state = '$state', config_company_zip = '$zip', config_company_phone = '$phone', config_company_site = '$site', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_records_per_page = 10, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1");
 
     //logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Created', log_description = '$name', log_created_at = NOW()");
@@ -344,8 +344,9 @@ if(isset($_POST['edit_default_settings'])){
     $config_default_transfer_to_account = intval($_POST['config_default_transfer_to_account']);
     $config_default_calendar = intval($_POST['config_default_calendar']);
     $config_default_net_terms = intval($_POST['config_default_net_terms']);
+    $config_records_per_page = intval($_POST['config_records_per_page']);
 
-    mysqli_query($mysqli,"UPDATE settings SET config_default_expense_account = $config_default_expense_account, config_default_payment_account = $config_default_payment_account, config_default_payment_method = '$config_default_payment_method', config_default_expense_payment_method = '$config_default_expense_payment_method', config_default_transfer_from_account = $config_default_transfer_from_account, config_default_transfer_to_account = $config_default_transfer_to_account, config_default_calendar = $config_default_calendar, config_default_net_terms = $config_default_net_terms WHERE company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE settings SET config_default_expense_account = $config_default_expense_account, config_default_payment_account = $config_default_payment_account, config_default_payment_method = '$config_default_payment_method', config_default_expense_payment_method = '$config_default_expense_payment_method', config_default_transfer_from_account = $config_default_transfer_from_account, config_default_transfer_to_account = $config_default_transfer_to_account, config_default_calendar = $config_default_calendar, config_default_net_terms = $config_default_net_terms, config_records_per_page = $config_records_per_page WHERE company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modified', log_description = 'Defaults', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
diff --git a/settings-defaults.php b/settings-defaults.php
index e383afd4..27128591 100644
--- a/settings-defaults.php
+++ b/settings-defaults.php
@@ -181,7 +181,7 @@
         </div>
       </div>
 
-      <div class="form-group mb-5">
+      <div class="form-group">
         <label>Net Terms</label>
         <div class="input-group">
           <div class="input-group-prepend">
@@ -195,6 +195,20 @@
         </div>
       </div>
 
+      <div class="form-group mb-5">
+        <label>Records per Page</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-fw fa-sort"></i></span>
+          </div>
+          <select class="form-control select2" name="config_records_per_page">
+            <?php foreach($records_per_page_array as $records_per_page) { ?>
+            <option <?php if($config_records_per_page == $records_per_page){ echo "selected"; } ?> ><?php echo $records_per_page; ?></option>
+            <?php } ?>
+          </select>
+        </div>
+      </div>
+
       <hr>
       <button type="submit" name="edit_default_settings" class="btn btn-primary">Save</button>
         
diff --git a/setup.php b/setup.php
index 42058c4e..57fb31ef 100644
--- a/setup.php
+++ b/setup.php
@@ -198,7 +198,7 @@ if(isset($_POST['add_company_settings'])){
 
   mysqli_query($mysqli,"INSERT INTO user_companies SET user_id = $user_id, company_id = $company_id");
  
-  mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$config_company_name', config_company_country = '$config_company_country', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_site', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1");
+  mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$config_company_name', config_company_country = '$config_company_country', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_site', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_records_per_page = 10, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1");
 
   //Create Some Data