ROBB, Senior Circuit Judge:
In the District Court appellant Margot Ellen Reiner, an employee of the Department of State, challenged a decision of the Foreign Service Grievance Board. The decision recommended a remedy for administrative errors committed in 1972-1973 which on five successive occasions caused the Department’s failure to consider Reiner for promotion. Reiner alleged the Board acted arbitrarily by basing relief on the promotion histories of Foreign Service Officers who entered the Service in 1971, rather than those who entered in 1966, when Rein-er became a Foreign Service Staff Officer. The District Court held that the Board did not err by considering Reiner a member of the class of 1971, and ordered summary judgment in favor of the United States and the Secretary of State. We affirm in part and reverse in part.
A somewhat detailed discussion of the Foreign Service personnel system is necessary to an understanding of this dispute. The Foreign Service consists of the federal employees, primarily in the State Department, who formulate and execute the foreign policies of the United States. Under the Foreign Service Act of 1946,1 Foreign Service personnel are classified into distinct categories as follows:
The personnel of the Service shall consist of the following categories of officers and employees:
(1) Chiefs of mission, who shall be appointed or assigned in accordance with the provisions of section 901 of this title;
(2) Foreign Service officers, who shall be appointed in accordance with section 906 of this title, including those serving as chiefs of mission;
(3) Foreign Service Reserve officers, who shall be assigned to the Service on a temporary basis from Government agencies or appointed on a temporary basis from outside the Government in accordance with the provisions of section 922 of this title, in order to make available to the Service such specialized skills as may from time to time be required;
(4) Foreign Service staff officers and employees, who shall be appointed in accordance with the provisions of section 936 of this title and who shall include all personnel who are citizens of the United States, not comprehended under paragraphs (1), (2), (3), and (6) of this section, and who shall occupy positions with technical, administrative, fiscal, clerical, or custodial responsibilities;
(5) Alien clerks and employees, who shall be appointed in accordance with the provisions of section 946 of this title; and
(6) Consular agents, who shall be appointed in accordance with the provisions of section 951 of this title.
22 U.S.C. § 861 (1976) (repealed 1980). Each category is governed by a separate pay scale, see 22 U.S.C. §§ 866-877, and by differing statutory requirements with respect to appointment, assignments, transfer, tenure, and citizenship. See 22 U.S.C. §§ 906-968.
Two categories are particularly important here: Foreign Service Officers, generally [1019]*1019referred to as “FSOs”; and Foreign Service Staff Officers, or “FSSOs”. Foreign Service Officers play the central role in day-today implementation of foreign policy. As described by the State Department, FSOs
carry out the foreign policies of the United States under the direction of the Secretary of State, participate in the formulation of those policies, represent the United States in relations with other governments and with international organizations, keep the U. S. Government informed of developments abroad, and protect American interests in foreign countries.
Introduction to 1971 Foreign Service Officer Examination 6. (J.A. 33) Foreign Service Officers “fill most of the more responsible positions in the [State] Department, aside from those requiring a high degree of technical or professional specialization in fields such as medicine, science, electronics, law, etc.” Introduction to 1972 Foreign Service Officer Examination 5. (J.A. 35) The category of Foreign Service Staff Officer or “FSSO” no longer exists, having been abolished by the Foreign Service Act of 1980.2 At the time of the events in this case, Department regulations described the category as
A corps of Staff Officers complementary to Foreign Service Officers and Foreign Service Reserve Officers, to give depth, stability, and continuity to the Foreign Service as a whole and to provide technical skills and experience not usually found in officers who are available to the Service in general foreign affairs work.
Foreign Affairs Manual Circular No. 255 at 2 (November 25, 1964). (J.A. 37) In 1965 the Foreign Service permitted FSSOs to perform duties previously performed only by FSOs, and established a new Junior FSSO Service designed to attract “highly motivated and well-qualified young men and women from colleges and universities . . . . ” Id. at 5. (J.A. 40) Consequently, in the time period relevant here, FSSOs often had duties entailing substantial responsibility-
Promotion in the Foreign Service operates, for the most part, according to a unique system of competitive ranking based on relative performance among employees in the same class. Under the 1946 Act the procedure for promotion of FSOs was as follows. Periodically, “selection boards” appointed by the Secretary of State convened to review the official performance files of officers in the same category and class. 22 U.S.C. § 993(a). These files were assembled by the Director General of the Foreign Service, and contained reports from supervising officers, records of commendations or disciplinary actions, and all other information relating to the ability and conduct of the officers under evaluation. Id. § 986. The selection board ranked the officers according to their performance relative to one another, and then submitted the list to the Secretary of State. Id. § 993(a). Promotions were then made by taking officers from the top of the list until the staffing requirements for the higher class were met. For example, if the Department decided to promote fifteen FSOs from Class 7 (FSO-7) to Class 6 (FSO-6) in any year (lower class numbers representing higher rank and salary), the officers receiving promotions would be the fifteen individuals ranked highest by the selection board which reviewed FSO-7s. Those FSOs who did not advance to higher classes within prescribed periods of time were “selected out,” i.e., retired from the Foreign Service.
The promotion procedures for Foreign Service Staff Officers were essentially the same as for Foreign Service Officers. The only differences were that the use of selection boards for FSSOs was established by regulation, not by statute;3 and unlike [1020]*1020FSOs, FSSOs were not subject to “selection out.” (Appellee’s Br. at 3 n.3)
Margot Ellen Reiner entered the Foreign Service in 1966 as a Foreign Service Staff Officer, Class 7 (FSS-7). She received a promotion to FSS-6 in 1967, and remained in the program for approximately five years, serving in Buenos Aires, Argentina; as a “Passport and Citizenship Officer” in Lima, Peru; and as a “personnel officer” in Saigon, Vietnam. In 1970 appellant sought to become a Foreign Service Officer. She took the examinations administered to all persons seeking appointment as an FSO, see 22 U.S.C. § 911, passing the written examination in December 1970 and the oral examination on October 21, 1971. She was then classified as a Foreign Service Officer, Class 7 (FSO-7).
For more than two years following her appointment Reiner did not receive a promotion. Beginning in the summer of 1972 and through 1973, Reiner sent letters to State Department officials expressing her concern that possibly her performance file had not been submitted to the proper selection boards. She received no direct response to her inquiries. The Department did submit her file to the January 1974 selection boahd, which recommended her promotion from FSO-7 to FSO-6, effective in June 1974. Reiner continued to maintain, however, that her career had been seriously prejudiced by administrative errors in 1972-1973.
In January 1976 Reiner filed a formal grievance pursuant to 22 U.S.C. §§ 1037 et seq. In May 1976 the Department acknowledged for the first time that in 1973 Rein-er’s performance file had not been submitted to two selection boards that should have considered her for promotion. The Department offered to extend by one year the time (“time-in-class”) within which Reiner would have to reach Class 5 or be selected out, but did not offer any retroactive promotions. At Reiner’s urging the Department investigated further and discovered that her performance file had not been submitted to three 1972 selection boards in addition to the two 1973 selection boards already acknowledged. In June 1976 the Department offered to make Rein-er’s promotion to FSO-6 (which became effective in June 1974) retroactive to May 1973, but she refused the offer.
Reiner retained counsel and filed a grievance with the Foreign Service Grievance Board on August 6, 1976, alleging that the Department’s failure to submit her file to five consecutive selection boards prejudiced her career. She requested that the Grievance Board recommend retroactive promotions that would place her at the level of FSOs who entered the Foreign Service in 1966 and whose performance had been of a quality similar to hers. Specifically, Reiner asked that her promotion to FSO-6 be made retroactive to May 1972, and that she receive promotions to FSO-5 retroactive to January 1974, FSO-4 retroactive to May 1975, and FSO-3 effective immediately. After a hearing the Grievance Board issued a decision rejecting most of Reiner’s requests for relief. The Board adopted the terms of a settlement offer made by the Department at the beginning of the hearing, which made Reiner’s promotion to FSO-6 retroactive to May 1972 and extended her time-in-class to two years.
On April 7, 1978 Reiner filed an action in the District Court alleging that the procedures and standards applied by the Board violated the Foreign Service Act of 1946, State Department regulations, and the due process clause of the Fifth Amendment. On April 30,1979 the District Court vacated the Grievance Board’s decision, holding that the Board “erred in allocating to the plaintiff the burden of showing by ‘compelling reasons’ that, but for the Department’s administrative errors, she would have received a promotion, or a series of promotions.” Reiner v. United States, Civil Action No. 78-0616, slip op. at 6 (D.D.C. April 30, 1979) (“Reiner I”). (J.A. 14) The court stated:
Elementary conceptions of justice and public policy require that the wrongdoer bear the risk of the uncertainty in com[1021]*1021puting damages which his wrong has created .... Thus, in the instant case, the Department cannot defeat plaintiff’s requests for relief in the form of retroactive promotion with its bare assertion that, because of its administrative error, it is impossible to know certainly whether plaintiff would have received the series of promotions she requested, or any promotion at all.
Id. at 7. (J.A. 15) The District Court held that the initial burden was on the plaintiff to show that the Department’s failure “was a substantial factor in her failure to be promoted” and that the burden should then have shifted to the Department to establish “by a preponderance of the evidence that, even in the absence of the Department’s administrative error, plaintiff would not have been promoted.” Id. (J.A. 15) Accordingly, the District Court remanded the case for rehearing by another panel of the Foreign Service Grievance Board.
A de novo hearing was held before a new panel of the Board on February 4, 1980. Because the Department conceded that retroactive promotions were due Reiner (J.A. 135) the central issue before the Board was that of appropriate relief. Reiner maintained, as she had earlier, that the relevant group for comparison with respect to promotion histories was the class of Foreign Service Officers who entered the Foreign Service in 1966, referred to as the “class of 1966”. Comparing herself to those FSOs, Reiner requested that her promotion to FSO-5 (granted October 22, 1978 while Reiner I was pending) be made retroactive to January 1974; that she be promoted to FSO-4, retroactive to May 1975; and that she be promoted to FSO-3, retroactive to April 1977. On July 18, 1980 the Grievance Board issued an opinion recommending retroactive promotions less extensive than those sought by Reiner. In re Margot E. Reiner, No. 76-342-State-180 II (July 18, 1980) (“FSGB Decision”). (J.A. 130) The Grievance Board reached a number of conclusions, the most important being that Reiner was to be considered a member of the class of 1971, the year she became an FSO, rather than 1966, the year she started as an FSSO. The Board said:
[W]e do not believe that the grievant is properly viewable as a member of the class of 1966. This is not to say that her service with the Department in the 1966-1971 period should be ignored — any more, presumably, than promotion panels would ignore such service. But to treat the persons who entered FSO service in 1966 as Reiner’s peer group would be to proceed contrary to the facts. For, in contrast to those who served as FSOs in the 1966-1971 period, Reiner did not in that period have an appointment leading to Service-wide qualifications as a political, economic or commercial functionary. She did consular work and she shared some instructional classes with members of the 1966 FSO class. But she did not compete with them — either from the standpoint of ranking or from the standpoint of selection-out. To state it directly and conclusively, Reiner could not have received FSO promotions in the 1966-71 period — though about half of the members of the class of 1966 progressed to FSO-5 in that period — for she was not in fact an FSO. Her status in that capacity commenced in 1971. We think it unquestionably follows that Reiner is to be viewed as a member of the class of 1971 for the purpose of the comparative tracings which must here be undertaken.
FSGB Decision at 17-18 (footnote omitted). (J.A. 141 — 42) The Board also found that Reiner’s performance had been “generally excellent”; the Board disagreed with the Department’s characterization of her performance as “average”. FSGB Decision at 18. (J.A. 142)
The Grievance Board then turned to each of Reiner’s specific requests for relief. The Board refused to promote Reiner to FSO-3, reasoning that the primary ground for such a promotion would be consideration of Rein-er as a top-ranking member of the class of 1966, an improper comparison in the Board’s view. Comparing her to the class of 1971 instead, the Board held “it would be wholly incorrect to place her in FSO-3” because “no one from that class has at[1022]*1022tained that rank.” FSGB Decision at 19 (J.A. 143) The Board agreed that Reiner should be promoted to FSO-4; however, it refused to recommend that the promotion be made retroactive to 1975, and ruled that October 1978 was the proper effective date. Again, the Board reasoned that such a promotion could have been achieved only by a member of the class of 1966, and that no members of the class of 1971 achieved FSO-4 in 1975. The Board similarly rejected a 1977 effective date, stating “[t]he percentage of Reiner’s class-of-1971 peers who attained the FS0^4 level in 1977, if not zero, is properly assumed to have been of the smallest sort. We cannot correctly place Reiner in the truly outstanding segment of her peer group.” FSGB Decision at 22. (J.A. 146) The Board set October 1978 as the date when a “generally excellent” 1977 class member most likely would have been promoted to FSO-4. Applying similar reasoning, the Board established March 1975 as the date on which Reiner would have been promoted to FSO-5, since “some members of the class of 1971 reached the FSO-5 level in 1975.” FSGB Decision at 23. (J.A. 147) The Board quickly rejected Reiner’s request that her promotion to FSO-6 (retroactive to October 9, 1972 as ordered by the Grievance Board prior to Reiner I) be made retroactive for an additional period to May 1972; the Board said that the relief already granted “represents a movement from FSO-7 to FSO-6 within less than a year. No one from the class of 1971 fared any better.” FSGB Decision at 24. (J.A. 148) Finally, the Board accepted Reiner’s requests that she receive “appropriate training” and that she be protected against selection-out for five years. Id.
Reiner appealed again to the District Court, arguing that the Board erred in refusing to consider her a member of the FSO class of 1966. On September 30, 1981 the District Court rejected Reiner’s contentions and dismissed the case. Reiner v. United States, Civil Action No. 81-0794, slip op. at 5 (D.D.C. Sept. 30, 1981) (“Reiner II"). (J.A. 7) The court ruled that its earlier opinion in Reiner I did not bind the Grievance Board to consider Reiner a member of the class of 1966 because that issue was not presented in the first case. Id. at 2. The District Court also rejected Reiner’s arguments that her training, experience, and function within the Foreign Service made her a member of the FSO class of 1966. The court referred to the Grievance Board’s discussion of the issue, FSGB Decision at 17 — 18 (J.A. 141-42), and noted that the court’s role in reviewing personnel decisions is “limited”, Reiner II, supra, at 3^4. (J.A. 5-6) This appeal followed.
Under the judicial review provisions of the 1946 Foreign Service Act, 22 U.S.C. § 1037c (1976), final actions of the Foreign Service Grievance Board are subject to review “in the District Courts of the United States, in accordance with the standards set forth in chapter 7 of Title 5. Section 706 of Title 5 shall apply without limitation or exception.” The District Court applied both the “arbitrary and capricious” test of 5 U.S.C. § 706(2)(A) and the “substantial evidence” test of 5 U.S.C. § 706(2)(E), noting that the court would not substitute its own judgment for that of the agency. Reiner II, supra, at 3-4. (J.A. 5-6) Certainly the “arbitrary and capricious” test applies as it does to any agency subject to section 706. The applicability of the substantial evidence test is less clear,4 but because Reiner does not argue the lack of substantial evidence to support the Board’s decision we need not rule on the question.
Reiner’s central argument is that the Board’s decision not to consider her a member of the FSO class of 1966 was arbitrary and capricious. As shown in the excerpts [1023]*1023above, the Board refused to consider the 1966 FSO class as Reiner’s peer group for two reasons. First, in the 1966-1971 period Reiner simply was not an FSO. Her status was that of an FSSO, which is not “an appointment leading to Service-wide qualifications as a political, economic or commercial functionary.” FSGB Decision at 17. (J.A. 141) Second, although Reiner “did consular work and ... shared some instructional classes with members of the 1966 FSO class,” she “did not compete with them — either from the standpoint of ranking or from the standpoint of selection-out”, i.e., as an FSSO she was not subject to the “selection-out” process. Id. It is undisputed that Reiner was not in fact an FSO until 1971. Considering the differences in statutory requirements and salary,5 Reiner cannot and does not contend that the two categories are identical. She argues vigorously, however, that from 1966-1971 she competed with FSOs in every important respect: training, assignments, evaluation, and promotion.
Each of Reiner’s comparisons is flawed. As for training, Reiner observes that the Basic Junior Officer Course she completed when appointed an FSSO “is mandatory for all newly appointed junior Foreign Service and USIA officers,” and that she was considered a “full participant” in the FSO orientation. (Appellant’s Br. at 14-15, quoting her Training Evaluation Report (June 22, 1966) (J.A. 68)) She ignores however that virtually all newly appointed Foreign Service employees, with the exception of “Alien Clerks and Employees,” attend the basic orientation course along with FSOs. In any event, Reiner’s attendance at training sessions while an FSSO has little relevance to the question of appropriate relief for mistakes which occurred after she became an FSO.
In terms of assignments, Reiner argues that all the positions to which she was assigned as a Junior FSSO “were FSO positions . . . often at a level above her personal grade.” Reiner may have performed some of the same tasks as FSOs, but that fact has little significance in the “rank-in-person” system under which the Foreign Service operates. As noted by a congressional committee during the 1980 revision of the Foreign Service Act,
[The Foreign Service] is a disciplined, professional Service based on a rank-in-person system similar to that followed by the military. In that system, rank and promotions attach to the individual, not to the position as in the civil service system. Therefore, promotions and assignment are separate occurrences in the rank-in-person system. This reflects the fundamentally different conditions of service between the civil service and the Foreign Service, particularly the need for frequent rotation from position to position.
H.R.Rep.No.992 (Part 1), 96th Cong., 2d Sess. 3 (1980). In other words the point of a rank-in-person system is that it allows frequent shifts of personnel while keeping promotion and rank separate. Reiner’s argument that she occupied “FSO positions” and should therefore be considered a member of the 1966 FSO class is a non sequitur in a rank-in-person regime.
Finally, Reiner maintains that she “competed” with 1966 FSOs in terms of evaluation and promotions from 1966-1971. Close examination of her brief reveals, however, that the most Reiner alleges is that she was evaluated by “the same selection boards” that evaluated FSOs. (Appellant’s Br. at 20; see also id. at 19-21) This implies only that the same people who ranked certain classes of FSOs also ranked classes of FSSOs, an unexceptional fact with little bearing on the retroactive promotions due [1024]*1024Reiner. With one exception6 (and that contested by the Department), Reiner never asserts that these selection boards compared FSSOs against FSOs, ranked her in relation to FSOs, or subjected her to the risks of selection-out based on comparisons to FSOs. Indeed Reiner acknowledges that she “did not directly compete with FSOs in the 1966-71 period since she was an FSSO and therefore not eligible for the same promotions as FSOs in the class of 1966.” (Appellant’s Br. at 32) This point being conceded, all that remains is the assertion that FSOs and FSSOs were evaluated according to the same procedures and occasionally by the same evaluators. It does not follow that Reiner was a member of the class of 1966, so that her promotions must track the advancement of members of that class.
In sum, Reiner presents no valid reason to question the Board’s judgment that she was not a member of the FSO class of 1966. The Board’s decision was based on Reiner’s status as an FSSO in 1966; the fact that she did not become an FSO until 1971; and her lack of direct competition with FSOs during the period from 1966-1971. The Board’s conclusion was thoroughly reasonable. We affirm the District Court on the issue of Reiner’s membership in the class of 1966.
Reiner’s second line of attack is that the Board acted arbitrarily in relying on the promotion histories of the class of 1971 because she “had a far greater potential for promotion than most, if not all, of the Class of 1971.” (Appellant’s Br. at 23) Reiner argues that because she had been in the Foreign Service for five years when she became an FSO-7 in 1971, (1) she had already demonstrated her ability and obtained valuable on-the-job experience, and (2) she was immediately eligible for promotion to FSO-6, unlike the other members of the class of 1971 who had to serve an eighteen-month probation period, and thus should not have been compared to the class as a whole. Reiner maintains that the Board “effectively ignored” her five years of Foreign Service employment prior to her appointment as an FSO, and thereby acted arbitrarily.
We cannot say that the Board acted arbitrarily in refusing to give more weight to the value of Reiner’s service as an FSSO. This is precisely the type of issue on which a reviewing court should not substitute its judgment for that of the agency. Moreover, Reiner did receive some credit for her experience. After passing the FSO examination in 1971, Reiner was appointed an FSO-7 pursuant to 22 U.S.C. § 911, which permits appointment of new FSOs directly to Class 7 (rather than the usual Class 8) “when in [the Secretary of State’s] opinion, their age, experience, or other qualifications make such appointment appropriate.” 22 U.S.C. § 911(b). This appears to be the way in which prior service is recognized under the 1946 Act, and Reiner received the benefits of the higher initial position. Reiner may think this is inadequate recognition for five years of valuable training and experience, but her complaint lies with the Foreign Service personnel system not the Board’s handling of her grievance.
Reiner’s second point, however, presents a flaw in the Board’s analysis. Newly appointed FSOs generally must serve an eighteen-month probationary period during which time they are not eligible for promotion. The Department acknowledged that Reiner’s prior service as an FSSO fulfilled her probation requirement, and that she would have been immediately eligible for [1025]*1025promotion from FSO-7 to FSO-6, eighteen months before most members of the class of 1971 became eligible. See Plaintiff’s Statement of Material Facts as to Which There is no Genuine Issue 118 (J.A. 22); Defendant’s Response to Plaintiff’s Statement of Material Facts H 18 (J.A. 27). Consequently, had the Department properly submitted Reiner’s performance file in 1972-1973, she could have been evaluated by four selection boards while other members of the class of 1971 were still on probation.7 In other words, Reiner should have had an eighteen-month “head start” on the other FSOs who entered the Service in 1971.
The analysis employed by the Board largely obviates the advantage Reiner would have had absent the Department’s error. Throughout its opinion the Board analyzes each retroactive promotion Reiner requests in terms of the number of 1971 class members who achieved that rank as of the date Reiner seeks. The Board then observes in each instance that relatively few, if any, 1971 class members reached such a position by such a date, and the Board concludes that only the most superior members of the class (not including Reiner) could have achieved the position. This analysis fails to note that most 1971 class members started to receive promotions approximately eighteen months after Reiner would have been eligible for promotion if the Department had not failed to submit her performance file.8 By using statistics from the class of 1971 as a whole, the Board failed to recognize the critical distinction between Reiner and most members of the class of 1971, i.e., that she was eligible for promotion long before her colleagues.
We think the Board’s failure to recognize Reiner’s immediate eligibility for promotion upon becoming an FSO was arbitrary and capricious. The 1971 statistics may have provided a convenient benchmark for assessing the retroactive promotions due Reiner, but in opting for convenience the Board disregarded an important distinction between Reiner and the class of 1971. The emphasis in a remedy award of this type must be on restoring the injured party to the position she would have occupied absent the administrative error. The Board’s decision fails to restore Reiner to that position. Of course, as the Board noted, “redress in the kind of situation here presented cannot be devised in wholly exact fashion.” FSGB Decision at 18. (J.A. 142) Our difficulty however is not with the precision of the Board’s calculations but with the premise upon which they were based. Considering the gravity of the Department’s initial error, its resistance to Reiner’s claims for relief, and that the Department bears the burden of proof, Reiner I, supra, at 7 (J.A. 15), we cannot overlook this flaw in the Board’s methodology.
The question of appropriate relief still remains. As we have said, we reject Rein-er’s contention that the class of 1966 is the proper basis for comparison. How best to recognize Reiner’s special circumstances we leave to the Foreign Service Grievance Board on remand. Because the Board’s present reliance on promotion histories of the 1971 FSO class fails to account for Reiner’s unique position, we must reverse the District Court on that narrow point and remand to the Board for additional proceedings consistent with this opinion. We do not mean to suggest that Reiner must be awarded retroactive promotions pre-dating by eighteen months those achieved by comparable members of the 1971 FSO class. We leave it to the Grievance Board to assess the actual effect Reiner’s earlier eligibility for promotion would have had on her advancement absent the Department’s errors. We are confident that the Board will be able to adjust its calculations or devise another method of awarding retroactive promotions that will adequately recognize Reiner’s early eligibility for promotion. In all other respects we approve the Board’s [1026]*1026decision and affirm the judgement of the District Court.
So ordered.