Fix client registration