Updated Communication Settings [MJ-284]

All tests pass