The heterogeneous group of primary immunodeficiencies requires personalized diagnosis and therapy to acheive an optimal outcome for each patient. This was exemplified by two patients with intrinsic B-cell class-switch defects (subclass of Hyper-IgM syndromes), where lymphoproliferation and autoimmunity determined the clinical course for many years due to lack of exact diagnosis. Based on genetics or a novel functional diagnostic approach, a definite individual diagnosis was established for each patient and they started Rituximab therapy. Autoimmune phenomena and generalized lymphadenopathy disappeared and remained well controlled during the observation period (3-4 years) without adverse effects. Quality of life increased remarkably in both patients.