diff --git a/entity/SupportTicket_entity/afterUiInit.js b/entity/SupportTicket_entity/afterUiInit.js
index 0e588e61aa69e7aa2ff720affb4992b4ab8b4d84..9080cb34c8aa3a5e80c59ab564a3014f11216c9c 100644
--- a/entity/SupportTicket_entity/afterUiInit.js
+++ b/entity/SupportTicket_entity/afterUiInit.js
@@ -1,3 +1,4 @@
+import("Contact_lib");
 import("Ticket_lib");
 import("Context_lib");
 import("Attribute_lib");
@@ -7,6 +8,16 @@ import("ActivityTask_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.TASK_PARENT_CONTEXT", "$field.TASK_PARENT_ID");
+    var presetLinks = JSON.parse(vars.getString("$param.PresetLinks_param"));
+        if(presetLinks[0][0] == "Person")
+        {
+            var contactId = presetLinks[0][1];
+
+            var orgContactId = ContactUtils.getOrganisationContactId(contactId);
+            
+            presetLinks[1] =  ["Organisation", orgContactId];
+        }
+    
+    TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", presetLinks, "$field.TASK_PARENT_CONTEXT", "$field.TASK_PARENT_ID");
     AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes", TicketUtils.begin(vars.get("$field.TICKETTYPE")).getTypeAttributes());
 }
\ No newline at end of file