diff --git a/Files/warranty.cfg.example b/Files/warranty.cfg.example
index d3266f8..de266cc 100644
--- a/Files/warranty.cfg.example
+++ b/Files/warranty.cfg.example
@@ -53,4 +53,4 @@ retry = 3
 #	1. vendor   - order number is returned from vendor ( only for Dell )
 #	2. common   - order number is randomly generated and same for all purchases
 #	3. descrete - order number is randomly generated and uniqe for every purchase
-order_no_type = vendor
+order_no_type = common
diff --git a/Files/warranty_meraki.py b/Files/warranty_meraki.py
index 7f94e63..a8cae33 100644
--- a/Files/warranty_meraki.py
+++ b/Files/warranty_meraki.py
@@ -85,6 +85,8 @@ def process_result(self, result, purchases):
                 else:
                     order_no = self.generate_random_order_no()
 
+                stripped_serial_no = str(serial_number).replace('-', '').strip()
+
                 data.update({'order_no': order_no})
                 data.update({'completed': 'yes'})
                 data.update({'vendor': 'Meraki'})
@@ -93,9 +95,13 @@ def process_result(self, result, purchases):
                 data.update({'line_item_type': 'device'})
                 data.update({'line_completed': 'yes'})
 
+                data.update({'line_notes': stripped_serial_no})
+                data.update({'line_contract_id': stripped_serial_no})
+
                 # warranty - Note: Meraki product warranties are a combined average so there is no way of knowing start
                 # date for a particular device
                 data.update({'line_contract_type': 'Warranty'})
+                data.update({'line_start_date': "0001-01-01"})
                 data.update({'line_end_date': license_expiration})
 
                 all_data.append(copy.deepcopy(data))