fix: [#754] Set the ID of the original requester early

fix: [#754] Set the ID of the original requester early #166