MYLOC-18 simplified conditional for echoClient options