of survivor benefit by reason of remarriage (1) Limitation on termination of benefit on grounds of remarriage Except as provided in paragraph (2), for purposes of subsection (a), the entitlement of an individual to a benefit payment under a District Retirement Program shall be determined as if, prior to the freeze date, the entitlement to the benefit payment under the Program did not terminate by reason of the remarriage of the individual. (2) Exception for survivors remarried before becoming 55 years of age Paragraph (1) does not apply if the individual remarried before becoming 55 years of age, unless the individual was married for at least 30 years to the individual on whose service the benefit payment is based. . (2) Special rule for survivors of judges Section 11–1568(c), District of Columbia Official Code, is amended in the matter following paragraph (3) by striking fifty-five years of age and inserting fifty-five years of age, unless the widow or widower was married to the judge for at least 30 years . (c) Conforming amendment Section 11003(6) of such Act (sec. 1–801.02(6), D.C. Official Code) is amended by striking section 11012(e) and (f) and inserting section 11012(e), (f), (g), and (h) . 3. Annuity deposit for certain service under District of Columbia retirement system Section 1905(a) of the National Defense Authorization Act for Fiscal Year 2010 ( Public Law 111–84