diff --git a/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php b/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php
index 361a95a3ce..a67fb41b44 100644
--- a/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php
+++ b/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php
@@ -386,6 +386,14 @@ class ConvertService
 
         $lead->set('createdContactId', $contact->getId());
 
+        if (
+            !$account &&
+            $contact->getAccount() &&
+            !$contact->getAccount()->get('originalLeadId')
+        ) {
+            $lead->set('createdAccountId', $contact->getAccount()->getId());
+        }
+
         return $contact;
     }