diff --git a/include/upgrader/streams/core/dad45ca2-61c9d5d7.cleanup.sql b/include/upgrader/streams/core/dad45ca2-61c9d5d7.cleanup.sql
index 4688ad0de03f317f82efc9937fa6661e80ba2ab8..de3289c2e5a0bac37f167d47bfff7cb18717c45a 100644
--- a/include/upgrader/streams/core/dad45ca2-61c9d5d7.cleanup.sql
+++ b/include/upgrader/streams/core/dad45ca2-61c9d5d7.cleanup.sql
@@ -83,8 +83,9 @@ INSERT INTO `%TABLE_PREFIX%form_entry_values` (
             '-', ''),
             '.', ''), 'X', A1.`phone_ext`))
     FROM `%TABLE_PREFIX%ticket` A1
+        INNER JOIN `%TABLE_PREFIX%user` A5 ON (A5.`id` = A1.`user_id`)
         INNER JOIN `%TABLE_PREFIX%form_entry` A2 ON (A2.`object_id`
-                = A1.`ticket_id` AND A2.`object_type` = 'U')
+                = A5.`id` AND A2.`object_type` = 'U')
         INNER JOIN `%TABLE_PREFIX%form` A4 ON (A4.`id` = A2.`form_id`)
         INNER JOIN `%TABLE_PREFIX%form_field` A3 ON (A3.`form_id`
                 = A4.`id`)