diff --git a/app/models/concerns/activity_message_handler.rb b/app/models/concerns/activity_message_handler.rb
index cdab4e17d..7fc020e3c 100644
--- a/app/models/concerns/activity_message_handler.rb
+++ b/app/models/concerns/activity_message_handler.rb
@@ -104,6 +104,8 @@ module ActivityMessageHandler
   end
 
   def create_assignee_change_activity(user_name)
+    user_name = activity_message_ownner(user_name)
+
     return unless user_name
 
     content = generate_assignee_change_activity_content(user_name)