5.0: moved WHO stuff to join handler