diff --git a/v1/src/apps/private/vehicles/services.js b/v1/src/apps/private/vehicles/services.js
index 5ebfeed..632b042 100644
--- a/v1/src/apps/private/vehicles/services.js
+++ b/v1/src/apps/private/vehicles/services.js
@@ -172,7 +172,17 @@ const postVehicle = async(req, res) => {
         data.is_available = false;
         data.posted_by = userId;
         const vehicle = new Model( data );
+        /// Generate id
         await vehicle.save();
+
+        /// Use id to create vehicle_code
+        const vehicle_id = "" + vehicle._id;
+        const vehicle_code = "C-" + vehicle_id.substring( 0 , 6 );
+        await Model.findByIdAndUpdate( vehicle._id , {
+            vehicle_code
+        });
+
+        vehicle.vehicle_code = vehicle_code;
         return res.send( vehicle );
     }catch(error){
         console.error( error );
diff --git a/v1/src/lib/Handlers/Account/index.js b/v1/src/lib/Handlers/Account/index.js
index a843ed5..ba10f86 100644
--- a/v1/src/lib/Handlers/Account/index.js
+++ b/v1/src/lib/Handlers/Account/index.js
@@ -107,9 +107,16 @@ async function complete_register( userId , data ){
     }
 
     const company = new companiesModels( data );
-
+    /// Generate company.id
     await company.save();
 
+    /// Use company.id to create company_code
+    const company_id = "" + company._id;
+    const company_code = "C-" + company_id.substring( 0 , 6 );
+    await companiesModels.findByIdAndUpdate( company._id , {
+        company_code
+    });
+
     user.company = company;
     user.job_role = "owner";
     user.permissions = permissions;