[BUG-FIX] Handle default group adding