server: Fix #30 Add join support