Make team chat work properly