Update for moved listeners

add auto join listener