JoinTeam Hook updates

I think this got reverted accidentally.