Changed approach for new user with group