Move JOIN action to an event listener (#82)