1. Short title This Act may be cited as the Equal Treatment of Public Servants Act of 2018 . 2. Replacement of the windfall elimination provision with a formula equalizing benefits for certain individuals with non-covered employment (a) In general Section 215(a) of the Social Security Act ( 42 U.S.C. 415(a) ) is amended by inserting after paragraph (7) the following: (8) (A) In the case of an individual whose primary insurance amount would be computed under paragraph (1) of this subsection— (i) who first becomes eligible for an old-age or disability insurance benefit after 2024, (ii) who subsequently becomes entitled to such benefit, and (iii) who has earnings derived from noncovered service performed in a year after 1977, the primary insurance amount of such individual shall be computed or recomputed under this paragraph. (B) The primary insurance amount of an individual described in subparagraph (A), as computed or recomputed under this paragraph, shall be the product derived by multiplying— (i) the individual’s primary insurance amount, as determined under paragraph (1) of this subsection and subparagraph (C) of this paragraph, by (ii) a fraction— (I) the numerator of which is the individual’s average indexed monthly earnings (determined without regard to subparagraph (C)), and (II) the denominator of which is an amount equal to the individual’s average indexed monthly earnings (as determined under subparagraph (C)), rounded, if not a multiple of $0.10, to the next lower multiple of $0.10. (C) (i) For purposes of determining an individual’s primary insurance amount pursuant to clauses (i) and (ii)(II) of subparagraph (B), the individual’s average indexed monthly earnings shall be determined by treating all recorded noncovered earnings (as defined in clause (ii)(I)) derived by the individual from noncovered service performed in each year after 1977 as wages (as defined in section 209 for purposes of this title), which shall be treated as included in the individual’s adjusted total covered earnings (as defined