Fixed client management (client me is now correctly added).