Protected from duplicated users join on subcalls & code cleanup