Set account on extended-join, simplify, fix docs