SWC-1078 and SWC-1081: more options for the join team widget