Fixed client unregistering