Adding group or account now uses find_or_create_by