diff --git a/app/builders/contact_inbox_with_contact_builder.rb b/app/builders/contact_inbox_with_contact_builder.rb
index d97f64cfe..bdfb1e13e 100644
--- a/app/builders/contact_inbox_with_contact_builder.rb
+++ b/app/builders/contact_inbox_with_contact_builder.rb
@@ -51,6 +51,8 @@ class ContactInboxWithContactBuilder
   def create_contact
     account.contacts.create!(
       name: contact_attributes[:name] || ::Haikunator.haikunate(1000),
+      last_name: contact_attributes[:last_name] || '',
+      middle_name: contact_attributes[:middle_name] || '',
       phone_number: contact_attributes[:phone_number],
       email: contact_attributes[:email],
       identifier: contact_attributes[:identifier],
diff --git a/app/builders/messages/facebook/message_builder.rb b/app/builders/messages/facebook/message_builder.rb
index fec298bce..61b0848c7 100644
--- a/app/builders/messages/facebook/message_builder.rb
+++ b/app/builders/messages/facebook/message_builder.rb
@@ -104,7 +104,8 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
 
   def process_contact_params_result(result)
     {
-      name: "#{result['first_name'] || 'John'} #{result['last_name'] || 'Doe'}",
+      name: result['first_name'] || 'John',
+      last_name: result['last_name'] || 'Doe',
       account_id: @inbox.account_id,
       avatar_url: result['profile_pic']
     }
diff --git a/app/services/telegram/incoming_message_service.rb b/app/services/telegram/incoming_message_service.rb
index d4eeb53d5..57a1e764e 100644
--- a/app/services/telegram/incoming_message_service.rb
+++ b/app/services/telegram/incoming_message_service.rb
@@ -71,7 +71,8 @@ class Telegram::IncomingMessageService
 
   def contact_attributes
     {
-      name: "#{telegram_params_first_name} #{telegram_params_last_name}",
+      name: telegram_params_first_name,
+      last_name: telegram_params_last_name,
       additional_attributes: additional_attributes
     }
   end
diff --git a/spec/builders/contact_inbox_with_contact_builder_spec.rb b/spec/builders/contact_inbox_with_contact_builder_spec.rb
index 8efeae9a5..37a564782 100644
--- a/spec/builders/contact_inbox_with_contact_builder_spec.rb
+++ b/spec/builders/contact_inbox_with_contact_builder_spec.rb
@@ -13,6 +13,7 @@ describe ContactInboxWithContactBuilder do
         inbox: inbox,
         contact_attributes: {
           name: 'Contact',
+          last_name: '1',
           phone_number: '+1234567890',
           email: 'testemail@example.com'
         }
@@ -35,6 +36,7 @@ describe ContactInboxWithContactBuilder do
 
       expect(contact_inbox.contact.id).not_to eq(contact.id)
       expect(contact_inbox.contact.name).to eq('Contact')
+      expect(contact_inbox.contact.last_name).to eq('1')
       expect(contact_inbox.contact.custom_attributes).to eq({ 'test' => 'test' })
       expect(contact_inbox.inbox_id).to eq(inbox.id)
     end