Remove use of hard coded id for agency user, use requestor