diff --git a/app/builders/agent_builder.rb b/app/builders/agent_builder.rb
index 2fe11cae0..d2715011c 100644
--- a/app/builders/agent_builder.rb
+++ b/app/builders/agent_builder.rb
@@ -29,8 +29,9 @@ class AgentBuilder
     user = User.from_email(email)
     return user if user
 
+    @name = email.split('@').first if @name.blank?
     temp_password = "1!aA#{SecureRandom.alphanumeric(12)}"
-    User.create!(email: email, name: name, password: temp_password, password_confirmation: temp_password)
+    User.create!(email: email, name: @name, password: temp_password, password_confirmation: temp_password)
   end
 
   # Checks if the user needs confirmation.
diff --git a/app/models/user.rb b/app/models/user.rb
index 443df1ef6..4aa38bbcd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -75,6 +75,7 @@ class User < ApplicationRecord
   # work because :validatable in devise overrides this.
   # validates_uniqueness_of :email, scope: :account_id
 
+  validates :name, presence: true
   validates :email, presence: true
 
   serialize :otp_backup_codes, type: Array
diff --git a/spec/builders/agent_builder_spec.rb b/spec/builders/agent_builder_spec.rb
index ac8a3229a..f140f2f29 100644
--- a/spec/builders/agent_builder_spec.rb
+++ b/spec/builders/agent_builder_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe AgentBuilder, type: :model do
 
       it 'creates a user with default values' do
         user = agent_builder.perform
-        expect(user.name).to eq('')
+        expect(user.name).to eq(email.split('@').first)
         expect(AccountUser.find_by(user: user).role).to eq('agent')
       end
     end
diff --git a/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb b/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
index 2d4b7ed01..75abc8518 100644
--- a/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
+++ b/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
@@ -188,12 +188,13 @@ RSpec.describe Crm::Leadsquared::Mappers::ConversationMapper do
       end
 
       context 'when sender has no name' do
+        let(:unnamed_contact) { create(:contact, account: account, name: '') }
         let(:unnamed_sender_message) do
           create(:message,
                  conversation: conversation,
-                 sender: create(:user, name: ''),
+                 sender: unnamed_contact,
                  content: 'Message',
-                 message_type: :outgoing,
+                 message_type: :incoming,
                  created_at: Time.zone.parse('2024-01-01 10:05'))
         end
 
@@ -201,7 +202,7 @@ RSpec.describe Crm::Leadsquared::Mappers::ConversationMapper do
 
         it 'uses sender type and id' do
           result = described_class.map_transcript_activity(hook, conversation)
-          expect(result).to include("User #{unnamed_sender_message.sender_id}")
+          expect(result).to include("Contact #{unnamed_sender_message.sender_id}")
         end
       end
     end