Fixed multiple clients showing up for the same client and related
issues.