Opinion for the Court filed by Senior Circuit Judge BAZELON.
Appellant challenges the District of Columbia’s requirement that ministers seeking regular entrance to the correctional facilities negotiate a standard Volunteer Services Agreement. The district court on cross-motions for summary judgment upheld the Department of Correction’s mandate as reasonably related to correctional needs for order and security. Because important factual questions that may affect our interpretation of the relevant District of Columbia statute remain unresolved, we remand for further findings by the district court.
I. Statutory and Regulatory Background
The Volunteer Services Act of 19771 (the Act) was adopted in order to reverse a longstanding rule against the use of volunteers in most District of Columbia programs and agencies.2 The Act established the broad policy under which the District would “utilize volunteer citizens in as many governmental programs as is practicable to serve the interests of the community.”3 The Act provided that volunteers may not, however, “be used to fill any position or perform any service which is currently being performed by an employee of the District of Columbia Government.”4 “Volunteer” is defined as “a person who donates his or her services to a specific program or department of the District of Columbia government by his or her free choice and without payment for the services rendered”;*325 in contrast, an “employee” is defined as “a person who is paid by the District of Columbia government ... for his or her services.”6 Under the Act, volunteers are “considered employees of the District of Columbia government” for purposes of insulation from liability for certain torts committed within the scope of their service;7 the District assumes liability to third parties “for tortious injury caused by volunteers under its supervision and control.” 8 Like employees, individuals injured while performing volunteer service are eligible for disability compensation benefits,9 and volunteers are subject to policies against conflicts of interest, including restrictions on political activity.10 In other respects, however, volunteers are treated differently from employees under the Act. Although certain expenses may be reimbursed,11 volunteers are not, of course, entitled to compensation. Nor are they entitied to retirement or unemployment benefits, or to life or health insurance based on their volunteer service.12
The Volunteer Services Act was not self-executing; instead, the Act became effective upon the promulgation of implementing regulations by the Director of Personnel, acting under the delegated authority of the Mayor.13 Under these regulations, the decision whether to use the services of a particular volunteer is left to the discretion of each District agency.14 Agencies may supplement the personnel regulations “when appropriate,” 15 but may not “limit, waive, amend, or otherwise modify the restrictions and requirements on the use of voluntary services set forth in [the personnel regulations] without the approval of the Director of Personnel.”16 The supplemental Corrections Department regulations are not in dispute in this case.17
*33The present controversy centers principally18 on the requirement that volunteers execute a “Volunteer Services Agreement” (Agreement), a standard form published by the Office of Personnel. It is unclear whether the Office of Personnel regulations make the use of this particular form mandatory.19 The Agreement sets out the names of the volunteer and of the volunteer’s supervisor, the duties to be performed by the volunteer, and the volunteer’s duty location and schedule. The Agreement concludes with the following statement:
Declaration of Volunteer
I hereby agree to donate my service to the D.C. Government in performing the duties described above. I understand that I will not be compensated for my services and that I am not entitled to other monetary benefits in connection with my volunteer work.
I will accept my instructions from the supervisor named above. I understand that my work assignment is limited to the duties described in this agreement unless otherwise authorized by my supervisor. I will keep my supervisor informed of my progress and will notify him/her if I am unable to report as scheduled or if I decide to terminate this agreement.
As a volunteer member of the D.C. Government workforce, I will not engage in any form of political activity during the hours I render service for the D.C. Government.
I understand that this agreement may be terminated at any time by the D.C. Government.20
At the heart of this dispute is whether a minister, who for sincere religious reasons is unable to endorse these statements, must nevertheless execute this Agreement as a prerequisite to gaming access to the District’s prisons to perform religious services for inmates requesting his ministry.
II. Background
Appellant Elijah Karriem is a minister of the Nation of Islam, also known as the Black Muslims, a Black nationalist sect *34popularized by Elijah Muhammad.21 In November 1981 Minister Karriem was asked by Elroy Lewis, then an inmate at the District of Columbia’s Minimum Security Facility at Lorton, Virginia (Lorton), to conduct religious services for inmate members of the Nation of Islam. In accordance with Corrections Department procedures,22 Lewis wrote to Lorton administrators asking that Minister Karriem be permitted to hold services on a regular basis within the facility.23 Delbert Jackson, at that time the Director of the Department of Corrections, approved Lewis’ request, and Minister Karriem was authorized to enter the facility to conduct religious services and classes on a biweekly basis.24 Although the Volunteer Services Act and regulations promulgated thereunder were then in ef-feet, Minister Karriem was not asked to subscribe a Volunteer Services Agreement when permission was initially granted for him to enter the prison regularly in a pastoral capacity.
Between December 1981 and April 1, 1982, Minister Karriem made approximately twenty visits to Lorton for the purpose of conducting religious services and classes.25 Throughout this period, he followed the normal sign-in, identification, and inspection procedures required of all visitors to Lorton. On each occasion he indicated the purpose of his visit as “religious.” In addition, both inmates and outside visitors attending the Nation of Islam services within Lorton were required to sign a second log sheet identifying them*35selves. Minister Karriem’s entries on the second log sheet consistently noted his status as “Minister” or “Guest Minister.”26
On April 1, 1982, for reasons that are not sufficiently clear from the record, Minister Karriem’s visits to the facility to conduct religious services were abruptly halted. It is undisputed that at no time during the period in which he had been coming to Lorton did Minister Karriem violate any prison regulations or otherwise pose a threat to prison order and security, and that neither the character of the Minister’s activities within the prison nor the Correction Department’s regulations regarding the entry of ministers had changed. It appears, rather, that the Department of Corrections had inadvertently construed a March 23, 1982 letter from Minister Karriem as being a formal request for volunteer status.27 For that reason — and, according to the Department of Corrections, solely for that reason — Lorton officials decided that in order to continue his visits, Minister Karriem would be required to sign a Volunteer Services Agreement. But as Minister Karriem points out and as the record plainly shows, Minister Karriem did not request volunteer status in the letter upon which the Department evidently and mistakenly relied.
Minister Karriem was unable for religious reasons28 to comply with this demand. Four features of the Volunteer Services Agreement were problematic from the standpoint of Minister Karriem’s religious views. First and most important, the Agreement required the signator to stipulate that he was donating his time and services to the District of Columbia government, thus identifying the volunteer with the prison administration. Minister Karriem insists that he is not volunteering his efforts to the District government but rather to the inmates of Lorton as individuals. *36This distinction is important to Minister Karriem because Black Muslims believe that the government is an unholy instrument of the White establishment in the oppression of Black people; “[according to [Elijah] Muhammad, the American government is unjust and corrupt in the eyes of Allah, and therefore it is sinful for righteous Muslims to participate in its affairs.”29
The Agreement also requires the volunteer to submit to the supervision of and to accept instruction from a specified official. This requirement presents two difficulties. First, at the time Minister Karriem was asked to sign the form, the name of the supervising official was left blank, but all concerned understood that the supervisor would be Imam Ba’th, the prison’s Islamic chaplain. Chaplain Ba’th is a former member of the Nation of Islam who “left the fold”; Minister Karriem believes that he is not permitted to associate with an “apostate” such as Imam Ba’th.30 After Minister Karriem filed suit, corrections authorities agreed to substitute the prison administrator for Chaplain Ba’th as supervising official.31 This accommodation, however, does not respond to Minister Karriem’s second concern — the scope of supervision. The term “supervision” is not defined in the Agreement. The personnel regulations indicate that, in most contexts, supervision would include assignment of the work to be performed and instructions as to the manner in which the assigned work is to be accomplished.32 Although Minister Karriem is willing to agree in writing to abide by prison rules and regulations, he cannot, consistent with his religious beliefs, accept instruction from any representative of the District of Columbia government as to the manner in which his ministry is to be conducted.33 Prison officials have stated, again after suit was filed, that they intend supervision to extend only to the scheduling of visits and services and the enforcement of prison rules and regulations.34 Yet, nowhere has this construction of the Agreement been reduced to writing.
Moreover, the Agreement prohibits volunteers from “engaging] in any form of political activity” during their hours of service. Again, the term “political activity” is undefined in the Agreement. Minister Karriem’s religion is inextricably intertwined with sociological, economic, and political beliefs.35 Consequently, he refuses to sign an Agreement that might prevent him from preaching his religio-political views. The Corrections Department, on the other hand, represented at oral argument that the prohibition extends only to partisan electioneering, an activity in which Minister Karriem has expressed no interest. The Department’s understanding of the prohibition has not been made explicit in writing, however.
Finally the Agreement purports to be terminable at will by the Department. Obviously, the Department could not terminate Minister Karriem’s visits for a constitutionally impermissible reason. Yet, Minister Karriem fears that the Department might attempt to terminate his visits because of the content of his teaching and, therefore, declines to place his “whole ministry ... under the direct power of Government,”36 rather than his God, Allah, by executing what might in the future be construed as a waiver.
As a result of his refusal to execute the Agreement, Minister Karriem was prohibited from further entering Lorton to conduct *37religious services for members of his faith.37 Minister Karriem first attempted to resolve his difficulties concerning the Agreement through the administrative processes of the Department of Corrections.38 When these efforts proved fruitless, Minister Karriem, proceeding pro se, filed suit in the United States District Court for the District of Columbia seeking damages and injunctive relief. His complaint alleged that he was not a volunteer within the meaning of the Volunteer Services Act and the regulations promulgated thereunder. The complaint further asserted that application of the Act and regulations to him— effectively requiring him to become a non-paid employee of the District of Columbia government in order to continue his religious ministry in the District’s prisons — violated the establishment and free exercise clauses of the first amendment as well as his fifth amendment right to equal protection of the laws.
On October 18, 1982, the district court conducted an evidentiary hearing confined to the single issue of whether Minister Karriem had been treated differently from other ministers with respect to the requirement of compliance with the Volunteer Services Act and regulations.39 Following the hearing, the district court rendered judgment in favor of defendants on the equal protection question.40 The court found that all ministers had been required to sign Volunteer Services Agreements in order to enter Lorton on a regular basis and that, therefore, Minister Karriem had not received discriminatory treatment.41 The court also suggested several reasons— probable frequency of entrance, relationship with inmates, extent of access within the facility — justifying the difference in treatment between ministers and other individuals and groups, such as fashion models and musical ensembles, who enter as “guest lecturers” and who do not have to comply with the Volunteer Services Act.42
The district court also granted summary judgment in favor of defendants on the remaining issues raised by the complaint. The court held first that Minister Karriem was a volunteer within the meaning of the Volunteer Services Act and regulations and was, therefore, required to sign an Agreement before entering Lorton to conduct services on a regular basis.43 The court also rejected appellant’s establishment clause claim, holding that the Agreement has neither “the purpose [nor] the primary effect of advancing or inhibiting religion.”*3844 The court found that the Agreement is not directed solely at ministers and is not a “ruse to keep ministers out of the prison.”45 Nor was the Agreement employed selectively, to inhibit particular religions and their representatives.46 Rather, the Agreement “is nothing more than an administrative tool to monitor activity within the prison; to ensure a peaceful, orderly environment within the institution, and to ensure that there is no misunderstanding about a visiting minister’s right to compensation for his services.”47 Moreover, the court held that the Agreement’s restrictions on political activity did not infringe the first amendment right to freedom of speech. Finding that the restriction was limited to partisan political activity, such as campaigning, the court concluded that the stricture was reasonably related to the maintenance of a peaceful and orderly prison environment.48
The court rejected Minister Karriem’s contention that the Agreement violated his first amendment right to exercise his religious convictions freely. While acknowledging that Minister Karriem’s “desire to enter the prison is religiously motivated,”49 the court held that “[pjlaintiff’s status as a minister does not convert an otherwise permissible regulation into an impermissible interference with the free exercise of religion.”50 Noting the discretion ordinarily accorded to the decisions of prison administrators concerning access to the institutions, the court concluded that the Agreement was essentially a time, place, and manner restriction, reasonably related to the “safe, orderly and efficient operation of a correctional institution and ... not inconsistent with Plaintiff’s first amendment rights.”51 On February 4, 1983, Minister Karriem filed a Notice of Appeal. Minister Karriem’s motion to proceed on appeal in forma pauperis was granted by this court,52 and counsel was appointed to represent him on appeal.53
III. Discussion
Minister Karriem raises a multitude of statutory and constitutional claims on this appeal.54 But the central issue before us is whether Minister Karriem is required to be a volunteer under the Volunteer Services Act, and thus must submit to its statutory obligations. Despite the potential gravity of the appellant’s constitutional claims, it is the general policy of the federal courts to avoid addressing broad constitutional issues unless their resolution is imperative in the context of the case at *39hand.55 There is ambiguity in the factual record over whether the District of Columbia is requiring Minister Karriem, and other ministers similarly situated, to sign a Volunteer Services Agreement. As we previously observed, it appears from the record that the Department of Corrections mistakenly imposed this requirement only because of a mispereeived request for assignment to volunteer status by Minister Karriem.56
Furthermore, we have been directed to no pronouncement by the Department of Personnel, which is charged with the construction and enforcement of the relevant statute,57 indicating that all clergy members seeking to minister on a regular basis are required to execute an Agreement as volunteers. As this court was informed by appellant at oral argument, ministers were routinely permitted to visit inmates and to perform religious services at Lorton, and, we may presume, at other District institutions throughout the period prior to adoption of the Act. Ministers operating in a capacity similar to that of Minister Karriem were not considered to be volunteers before the Act was adopted, and there is nothing in the terms of the Act or regulations that woujd suggest any intention to alter the status of such individuals or to force them to become volunteers of the government as a requisite to continuing their ministries.
Here, appellant presents strong arguments that the Volunteer Services Act was never intended to apply to situations such as his. He points out that the Act defines a “volunteer” as “a person who donates his or her services to a specific program or department of the District of Columbia Government, by his or her free choice and without payment for the services rendered.” 58 This language suggests that a volunteer must meet three conditions. First, there must be an affirmative and voluntary choice to volunteer; one may not be compelled to become a volunteer. Second, the service must be offered to the District of Columbia government. Third, the service must assist some government agency or program in carrying out its mis*40sion. Minister Karriem’s involvement with the prison may well assist the chaplains’ program in carrying out its mission; nevertheless, it seems clear from, the record that it fails to fulfill the first two conditions. He has not volunteered; rather, volunteer status is being thrust upon him as a precondition to his continued access to the facility. Moreover, he does not wish to participate in any government program; he merely desires to extend his pastoral services to incarcerated members of his faith.
Therefore, it appears that the imposition of a “volunteer” status upon the appellant was the result of a misreading by the District of Columbia of the letter from Minister Karriem. The District of Columbia has also suggested quite strongly that an Agreement is not necessary in all cases. In fact, Minister Karriem is currently visiting the prison as a guest lecturer on a regular basis without having signed an Agreement.59 On remand, the district court should determine whether, and in what manner, Minister Karriem is presently being restricted by not signing the Agreement. The district court should determine whether ministers can generally forego becoming volunteers if they adhere to reasonable time, place, and manner restrictions imposed by the Department.
So far we have observed that it does not appear that the Act and accompanying regulations necessarily require Minister Kar-riem to sign the Agreement before he can be permitted to resume his ministerial activities at Lorton. But if the Department of Corrections nevertheless intends on its own initiative to require all ministers regularly entering Lorton to execute a Volunteer Agreement, then the constitutional questions posed by Minister Karriem must be addressed. We are not ready today, however, to resolve those questions since the record is incomplete and since the éx-tent of the burden actually imposed on Minister Karriem is unclear.
This court has been presented with evidence that the Department of Corrections has already undertaken some steps towards clarification of its policy that appears to ameliorate the conflict between the parties in this case. Further clarification of the Department’s policy may resolve most, if not all, of the factual ambiguities confronting this court, and may even lead to a mutually agreeable resolution of the instant controversy. The district court on remand should establish whether the standard form agreement’s particular language is currently required.60 If it is not, the District of Columbia may consider substituting language that would avoid the appellant’s religious concerns and still accommodate the appellee’s interests in prison security.61 Minister Karriem has maintained that he is willing to submit to reasonable time, place, or manner regulations controlling access to and activities within Lorton in the interests of institutional security and order.62
Furthermore, the four specific requirements of the Volunteer Services Agreement, which appeared problematic from the standpoint of Minister Karriem’s religious views, need further factual clarification. Here we neither decide nor urge upon the parties or the district court a “correct” resolution of these specific issues. Instead we remand to determine what genuine justiciable issues remain in contention. Such clarification will be essential to any later analysis of the constitutional questions that are potentially at stake.63
First, the requirement that the signator stipulate that he was donating his time or *41services to the District of Columbia government may be modified or not necessary under the Department’s policy. The district court should determine whether such a requirement may be meant simply to identify the volunteer status of the appellant’s work. If so, the Agreement may be modified to state that Minister Karriem was volunteering his services to the inmates of Lorton.
Second, Minister Karriem’s objection to the scope of supervision may no longer be at issue because the appellees have indicated that any such supervision was intended to involve restrictions on time, place, and manner, rather than substance.64 As we previously noted, correction authorities have already substituted the prison administrator for Chaplain Ba’th as supervising official in response to a request from the district court.
Third, the Agreement’s prohibition against political activity was conceded by the appellees to preclude only partisan political activities during working hours.65 The Agreement may need simply to be clarified to reflect this position. Minister Karriem indicates that he has no desire to engage in such partisan political activity as long as he can continue to preach about “matters of politics, economics, and sociology as well as spiritual matters.”66
Finally, Minister Karriem’s objection that the Agreement is terminable at will may be met if the appellees modify the Agreement to indicate that the Department could not terminate his visits for a constitutionally impermissible reason, such as to restrict the substance of the appellant’s ministry. Both parties may concede that the Agreement was not meant as a waiver of constitutional rights.
Conclusion
The Department of Corrections has thus far proceeded on the theory that it is obliged by the terms of the Act and regulations to require Minister Karriem to sign the Agreement before he can be permitted to resume his ministerial activities at Lor-ton. As we have seen, this construction is not compelled by the Act itself. We therefore remand to the district court for a determination as to whether the Corrections Department’s interpretation of the Act is required by the Department of Personnel. If such a construction is not required, the district court should determine whether the Department of Corrections nevertheless intends on its own initiative to require all ministers regularly entering Lorton to execute a Volunteer Services Agreement as a security or administrative procedure.
If the Department of Personnel adopts the Corrections Department’s construction of the Act, or if the Department of Corrections intends to enforce the signature requirement as a purely internal regulation, the district court will need to determine if these regulations permit a revised form of a Volunteer Services Agreement. Alternatively, the District might waive the requirement for those who, like Minister Karriem, are unable for religious reasons to comply, or might substitute other security devices, such as scheduling, searches, and identification procedures in order to facilitate the objectives of prison administrators without engendering unnecessary conflicts. We withhold final judgment on any constitutional objections until the Department has, on remand, been given an opportunity to clarify its policy.
Vacated and remanded.