Add auto-join group option