Fix #680 - make channels follow user-level settings when appropriate