server: fixed client manegement