fixes #4906 - respect organization for sync plans