diff --git a/package.json b/package.json
index d2d03f537..586710bc5 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,9 @@
     "tenants:migrate:latest": "lerna run cli:tenants:migrate:latest --scope \"@bigcapital/server\"",
     "system:seed:latest": "lerna run cli:system:seed:latest --scope \"@bigcapital/server\"",
     "tenants:seed:latest": "lerna run cli:tenants:seed:latest --scope \"@bigcapital/server\"",
-    "generate:sdk-types": "lerna run openapi:export --scope \"@bigcapital/server\" && lerna run generate --scope \"@bigcapital/sdk-ts\" && lerna run build --scope \"@bigcapital/sdk-ts\""
+    "generate:sdk-types": "lerna run openapi:export --scope \"@bigcapital/server\" && lerna run generate --scope \"@bigcapital/sdk-ts\" && lerna run build --scope \"@bigcapital/sdk-ts\"",
+    "format": "lerna run format",
+    "format:check": "lerna run format:check"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.4.2",
diff --git a/packages/webapp/src/containers/Customers/CustomerForm/CustomerFormBasicSection.tsx b/packages/webapp/src/containers/Customers/CustomerForm/CustomerFormBasicSection.tsx
index e8ea912df..8860301b6 100644
--- a/packages/webapp/src/containers/Customers/CustomerForm/CustomerFormBasicSection.tsx
+++ b/packages/webapp/src/containers/Customers/CustomerForm/CustomerFormBasicSection.tsx
@@ -55,14 +55,14 @@ export function CustomerFormBasicSection({}) {
       </FFormGroup>
       
       <FFormGroup
-        name={'customer_code'}
+        name={'code'}
         label={'Customer Code'}
         helperText="Add a unique account number to identify, reference and search for the contact."
         inline
         fill
       >
         <FInputGroup
-          name={'customer_code'}
+          name={'code'}
           fill />
       </FFormGroup>
 
diff --git a/packages/webapp/src/containers/Customers/CustomerForm/utils.tsx b/packages/webapp/src/containers/Customers/CustomerForm/utils.tsx
index cc0f62577..458ff1a3f 100644
--- a/packages/webapp/src/containers/Customers/CustomerForm/utils.tsx
+++ b/packages/webapp/src/containers/Customers/CustomerForm/utils.tsx
@@ -14,6 +14,7 @@ export const defaultInitialValues = {
   last_name: '',
   company_name: '',
   display_name: '',
+  code: '',
 
   email: '',
   work_phone: '',
diff --git a/packages/webapp/src/containers/Vendors/VendorForm/VendorFormBasicSection.tsx b/packages/webapp/src/containers/Vendors/VendorForm/VendorFormBasicSection.tsx
index dce134100..9f32c44bb 100644
--- a/packages/webapp/src/containers/Vendors/VendorForm/VendorFormBasicSection.tsx
+++ b/packages/webapp/src/containers/Vendors/VendorForm/VendorFormBasicSection.tsx
@@ -54,14 +54,14 @@ export function VendorFormBasicSection({}) {
       </FFormGroup>
 
       <FFormGroup
-        name={'vendor_code'}
+        name={'code'}
         label={'Vendor Code'}
         helperText="Add a unique account number to identify, reference and search for the contact."
         inline
         fill
         fastField
       >
-        <FInputGroup name={'vendor_code'} fill fastField />
+        <FInputGroup name={'code'} fill fastField />
       </FFormGroup>
 
       {/*----------- Company Name -----------*/}
diff --git a/packages/webapp/src/containers/Vendors/VendorForm/utils.tsx b/packages/webapp/src/containers/Vendors/VendorForm/utils.tsx
index ea57a30fd..b14183930 100644
--- a/packages/webapp/src/containers/Vendors/VendorForm/utils.tsx
+++ b/packages/webapp/src/containers/Vendors/VendorForm/utils.tsx
@@ -13,6 +13,7 @@ export const defaultInitialValues = {
   last_name: '',
   company_name: '',
   display_name: '',
+  code: '',
 
   email: '',
   work_phone: '',