Fix duplicating &amp; issue in client names