; or (ii) meets the age and service requirements that would subject the individual to mandatory separation under section 8425 if such individual had remained in the former covered position. (E) In accordance with procedures established by the Director of the Office of Personnel Management, an affected individual may file an election to have any creditable service performed by the affected individual treated in accordance with this chapter without regard to subparagraph (B). (F) Nothing in this paragraph shall be construed to apply to such affected individual any other pay-related laws or regulations applicable to a covered position. . (2) Technical and conforming amendments (A) Chapter 84 of title 5, United States Code, is amended— (i) in section 8414(b)(3), by inserting (1) after subsection (d) ; (ii) in section 8415— (I) in subsection (e), in the matter preceding paragraph (1), by inserting (1) after subsection (d) ; and (II) in subsection (h)(2)(A), by striking (d)(2) and inserting (d)(1)(B) ; (iii) in section 8421(a)(1), by inserting (1) after (d) ; (iv) in section 8421a(b)(4)(B)(ii), by inserting (1) after section 8412(d) ; (v) in section 8425, by inserting (1) after section 8412(d) each place it appears; and (vi) in section 8462(c)(3)(B)(ii), by inserting (1) after subsection (d) . (B) Title VIII of the Foreign Service Act of 1980 ( 22 U.S.C. 4041 et seq.) is amended— (i) in section 805(d)(5) ( 22 U.S.C. 4045(d)(5) ), by inserting (1) after or 8412(d) ; and (ii) in section 812(a)(2)(B) ( 22 U.S.C. 4052(a)(2)(B) ), by inserting (1) after or 8412(d) . (c) CIA employees Section 302 of the Central Intelligence Agency Retirement Act ( 50 U.S.C. 2152 ) is amended by adding at the end the following: (d) Employees disabled on duty (1) Definitions In this subsection— (A) the term affected employee means an employee of the Agency covered under subchapter II of chapter 84 of title 5, United States Code, who— (i) is performing service in a position designated under subsection (a)