diff --git a/app/pages/auth.vue b/app/pages/auth.vue
index a57c643..2979fe3 100644
--- a/app/pages/auth.vue
+++ b/app/pages/auth.vue
@@ -47,12 +47,25 @@ const loginRole = computed(() => {
 
 const isNewUser = ref(false)
 const checkingEmail = ref(false)
+const showTos = ref(false)
+const waiverTrigger = ref<HTMLAnchorElement | null>(null)
+
+function restoreWaiverFocus(event: Event) {
+  event.preventDefault()
+  waiverTrigger.value?.focus()
+}
+const waiverDate = new Date().toLocaleDateString(undefined, {
+  year: 'numeric', month: 'long', day: 'numeric',
+})
 
 const schema = computed(() => {
   if (isNewUser.value) {
     return z.object({
       email: z.string().email('Invalid email'),
       name: z.string().min(1, 'Name is required'),
+      tosCheck: z.literal(true, {
+        message: 'You must accept the Terms of Service to create an account.',
+      }),
     })
   }
 
@@ -64,6 +77,7 @@ const schema = computed(() => {
 const state = reactive({
   email: '',
   name: '',
+  tosCheck: false,
 })
 
 async function sendMagicLink(callbackURL: string) {
@@ -95,6 +109,7 @@ async function handleSubmit(_event: FormSubmitEvent<any>) {
         email: state.email,
         name: state.name,
         role: loginRole.value,
+        tosCheck: state.tosCheck,
       },
     }).catch((error) => {
       toast.add({
@@ -167,6 +182,8 @@ async function handleSubmit(_event: FormSubmitEvent<any>) {
     description: 'Please enter your name to create an account.',
     color: 'primary',
   })
+
+
 }
 </script>
 
@@ -233,6 +250,83 @@ async function handleSubmit(_event: FormSubmitEvent<any>) {
               />
             </UFormField>
 
+            <UFormField v-if="isNewUser" name="tosCheck">
+              <div class="flex items-center gap-2">
+                <input
+                  type="checkbox"
+                  id="tos"
+                  v-model="state.tosCheck"
+                  class="w-4 h-4 text-[#0d1735] border-gray-300 rounded focus:ring-[#0d1735]"
+                />
+
+                <label for="tos" class="text-sm text-[#5c6475]">
+                  I agree to the
+                  <a ref="waiverTrigger" href="/terms" class="text-[#0d1735] font-bold hover:underline"
+                  @click.prevent="showTos = true">Release and Waiver of Liability</a>
+                </label>
+              </div>
+            </UFormField>
+            
+            <UModal v-model:open="showTos" title="Release and Waiver of Liability"
+              :content="{ onCloseAutoFocus: restoreWaiverFocus }"
+              :ui="{
+                overlay: 'bg-slate-900/50 backdrop-blur-sm',
+                content: 'flex max-h-[85dvh] w-full max-w-2xl flex-col overflow-hidden rounded-3xl bg-white font-sans shadow-2xl',
+              }"
+            >
+              <template #content>
+                    <header class="flex shrink-0 items-start justify-between gap-4 border-b border-slate-100 px-6 py-5 sm:px-8">
+                      <div>
+                        <p class="mb-1 text-xs font-semibold uppercase tracking-widest text-indigo-600">Friends of MLK</p>
+                        <h2 id="waiver-title" class="text-xl font-bold leading-tight text-slate-900 sm:text-2xl">
+                          Release and Waiver of Liability
+                        </h2>
+                      </div>
+                      <button type="button" aria-label="Close waiver" @click="showTos = false"
+                        class="flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-slate-100 text-xl text-slate-600 transition hover:bg-slate-200"
+                      >×</button>
+                    </header>
+
+                    <div class="min-h-0 overflow-y-auto px-6 py-6 text-left text-sm leading-7 text-slate-600 sm:px-8">
+                      <div class="space-y-6">
+                        <p>This Release and Waiver of Liability (the “Release”) executed on <strong class="font-semibold text-slate-900">{{ waiverDate }}</strong> by <strong class="font-semibold text-slate-900">{{ state.name.trim() || 'the person creating this account' }}</strong> (“Participant”) releases Friends of MLK (“FOMLK”) and each of its directors, officers, employees, and agents from any and all liability, claims, demands, costs and damages of any kind.</p>
+                        <p>Participant understands that the scope of Participant’s relationship with FOMLK is limited to a Participant position and that no compensation is expected in return for services provided by Participant; that FOMLK will not provide any benefits traditionally associated with employment to Participant; and that Participant is responsible for his/her own insurance coverage in the event of personal injury or illness as a result of Participant’s services to FOMLK.</p>
+                        <section>
+                          <h3 class="mb-2 font-semibold text-slate-900">1. Waiver and Release</h3>
+                          <p>I, the Participant, release and forever discharge and hold harmless FOMLK and its successors and assigns from any and all liability, claims, and demands of whatever kind of nature, either in law or in equity, which arise or may hereafter arise from the services I provide to FOMLK. I understand and acknowledge that this Release discharges FOMLK from any liability or claim that I may have against FOMLK with respect to bodily injury, personal injury, illness, death, or property damage that may result from the services I provide to FOMLK or occurring while I am providing Participant services.</p>
+                        </section>
+                        <section>
+                          <h3 class="mb-2 font-semibold text-slate-900">2. Insurance</h3>
+                          <p>Further I understand that FOMLK does not assume any responsibility for or obligation to provide me with financial or other assistance, including but not limited to medical, health, or disability benefits or insurance. I expressly waive any such claim for compensation or liability on the part of FOMLK beyond what may be offered freely by FOMLK in the event of injury or medical expenses incurred by me.</p>
+                        </section>
+                        <section>
+                          <h3 class="mb-2 font-semibold text-slate-900">3. Medical Treatment</h3>
+                          <p>I hereby Release and forever discharge FOMLK from any claim whatsoever which arises or may hereafter arise on account of any first-aid treatment or other medical services rendered in connection with an emergency during my tenure as a Participant with FOMLK.</p>
+                        </section>
+                        <section>
+                          <h3 class="mb-2 font-semibold text-slate-900">4. Assumption of Risk</h3>
+                          <p>I understand that the services I provide to FOMLK should not but may include activities that may be hazardous to me. As a Participant, I hereby expressly assume risk of injury or harm from these activities and Release FOMLK from all liability.</p>
+                        </section>
+                        <section>
+                          <h3 class="mb-2 font-semibold text-slate-900">5. Photographic Release</h3>
+                          <p>I grant and convey to FOMLK all right, title, and interests in any and all products, photographs, images, video, or audio recordings of me or my likeness or voice made by FOMLK in connection with my providing Participant services to FOMLK.</p>
+                        </section>
+                        <section>
+                          <h3 class="mb-2 font-semibold text-slate-900">6. Other</h3>
+                          <p>As a Participant, I expressly agree that this Release is intended to be as broad and inclusive as permitted. I agree that in the event that any clause or provision of this Release is deemed invalid, the enforceability of the remaining provisions of this Release shall not be affected. I agree to indemnify, defend, and hold harmless FOMLK, and its directors, officers, employees, agents, subsidiaries and affiliates from and against any and all losses, injuries, claims, demands, liabilities, obligations, suits, penalties, forfeitures, costs or expenses of every kind including but not limited to attorney’s fees, arising out of participation in FOMLK activities.</p>
+                        </section>
+                        <p class="rounded-xl bg-indigo-50 p-4 font-medium text-slate-700">By clicking the checkbox, I express my understanding and intent to enter into this Release and Waiver of Liability willingly and voluntarily.</p>
+                      </div>
+                    </div>
+
+                    <footer class="flex shrink-0 justify-end border-t border-slate-100 bg-slate-50 px-6 py-4 sm:px-8">
+                      <button type="button" @click="showTos = false"
+                        class="rounded-xl bg-[#0d1735] px-5 py-2.5 text-sm font-semibold text-white transition hover:bg-[#132149]"
+                      >Back to signup</button>
+                    </footer>
+              </template>
+            </UModal>
+
             <UButton
               :loading="checkingEmail"
               loading-auto
diff --git a/server/utils/auth.ts b/server/utils/auth.ts
index 1c47072..b0d07d9 100644
--- a/server/utils/auth.ts
+++ b/server/utils/auth.ts
@@ -23,6 +23,7 @@ export const auth = betterAuth({
 
   plugins: [
     magicLink({
+      disableSignUp: true,
       async sendMagicLink({ email, url }) {
         try {
           await mailer.sendMail({
diff --git a/server/utils/schemas.ts b/server/utils/schemas.ts
index 5a97773..7a68a4f 100644
--- a/server/utils/schemas.ts
+++ b/server/utils/schemas.ts
@@ -6,6 +6,7 @@ export const userCreateSchema = z.object({
   name: z.string().min(1).max(100),
   email: emailSchema,
   role: z.enum(['coach', 'reader']).default('reader'),
+  tosCheck: z.literal(true, { message: 'You must accept the Terms of Service to create an account.' }),
 })
 
 export const classCreateSchema = z.object({