1 files changed, 8 insertions, 0 deletions

diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb
index 7ab663718db..edf6d75b632 100644
--- a/app/services/issues/create_service.rb
+++ b/app/services/issues/create_service.rb
@@ -56,6 +56,7 @@ module Issues
       handle_add_related_issue(issue)
       resolve_discussions_with_issue(issue)
       create_escalation_status(issue)
+      try_to_associate_contact(issue)
 
       super
     end
@@ -99,6 +100,13 @@ module Issues
 
       IssueLinks::CreateService.new(issue, issue.author, { target_issuable: @add_related_issue }).execute
     end
+
+    def try_to_associate_contact(issue)
+      return unless issue.external_author
+      return unless current_user.can?(:set_issue_crm_contacts, issue)
+
+      set_crm_contacts(issue, [issue.external_author])
+    end
   end
 end