diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index be6603976..411594a36 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -41,7 +41,7 @@
           size="16px"
         />
         <div class="sender--available-name">
-          {{ sender.available_name || sender.name }}
+          {{ sender.name }}
         </div>
       </div>
     </div>
@@ -121,7 +121,7 @@ export default {
 
       return this.data.message_type === 1 && !this.isHovered && sender
         ? {
-            content: `Sent by: ${sender.available_name || sender.name}`,
+            content: `Sent by: ${sender.name}`,
             classes: 'top',
           }
         : false;
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 0105088aa..e6c187f48 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -214,7 +214,7 @@ class Conversation < ApplicationRecord
   end
 
   def create_assignee_change(user_name)
-    params = { assignee_name: assignee&.available_name, user_name: user_name }.compact
+    params = { assignee_name: assignee.name, user_name: user_name }.compact
     key = assignee_id ? 'assigned' : 'removed'
     key = 'self_assigned' if self_assign? assignee_id
     content = I18n.t("conversations.activity.assignee.#{key}", **params)
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 4f636bd43..617d4ff75 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -90,9 +90,9 @@ RSpec.describe Conversation, type: :model do
 
     it 'creates conversation activities' do
       # create_activity
-      expect(conversation.messages.pluck(:content)).to include("Conversation was marked resolved by #{old_assignee.available_name}")
-      expect(conversation.messages.pluck(:content)).to include("Assigned to #{new_assignee.available_name} by #{old_assignee.available_name}")
-      expect(conversation.messages.pluck(:content)).to include("#{old_assignee.available_name} added #{label.title}")
+      expect(conversation.messages.pluck(:content)).to include("Conversation was marked resolved by #{old_assignee.name}")
+      expect(conversation.messages.pluck(:content)).to include("Assigned to #{new_assignee.name} by #{old_assignee.name}")
+      expect(conversation.messages.pluck(:content)).to include("#{old_assignee.name} added #{label.title}")
     end
   end
 
@@ -193,7 +193,7 @@ RSpec.describe Conversation, type: :model do
 
       it 'creates self-assigned message activity' do
         expect(update_assignee).to eq(true)
-        expect(conversation.messages.pluck(:content)).to include("#{agent.available_name} self-assigned this conversation")
+        expect(conversation.messages.pluck(:content)).to include("#{agent.name} self-assigned this conversation")
       end
     end
   end
@@ -223,20 +223,20 @@ RSpec.describe Conversation, type: :model do
       labels = [first_label].map(&:title)
       expect(conversation.update_labels(labels)).to eq(true)
       expect(conversation.label_list).to match_array(labels)
-      expect(conversation.messages.pluck(:content)).to include("#{agent.available_name} added #{labels.join(', ')}")
+      expect(conversation.messages.pluck(:content)).to include("#{agent.name} added #{labels.join(', ')}")
     end
 
     it 'adds and removes previously added labels' do
       labels = [first_label, fourth_label].map(&:title)
       expect(conversation.update_labels(labels)).to eq(true)
       expect(conversation.label_list).to match_array(labels)
-      expect(conversation.messages.pluck(:content)).to include("#{agent.available_name} added #{labels.join(', ')}")
+      expect(conversation.messages.pluck(:content)).to include("#{agent.name} added #{labels.join(', ')}")
 
       updated_labels = [second_label, third_label].map(&:title)
       expect(conversation.update_labels(updated_labels)).to eq(true)
       expect(conversation.label_list).to match_array(updated_labels)
-      expect(conversation.messages.pluck(:content)).to include("#{agent.available_name} added #{updated_labels.join(', ')}")
-      expect(conversation.messages.pluck(:content)).to include("#{agent.available_name} removed #{labels.join(', ')}")
+      expect(conversation.messages.pluck(:content)).to include("#{agent.name} added #{updated_labels.join(', ')}")
+      expect(conversation.messages.pluck(:content)).to include("#{agent.name} removed #{labels.join(', ')}")
     end
   end