diff --git a/playwright-tests/tests/becomeAMentee.page.spec.ts b/playwright-tests/tests/becomeAMentee.page.spec.ts
index 71d32bc..b033db4 100644
--- a/playwright-tests/tests/becomeAMentee.page.spec.ts
+++ b/playwright-tests/tests/becomeAMentee.page.spec.ts
@@ -4,7 +4,9 @@ import { HomePage } from '@pages/home.page';
 import { MentorshipPage } from '@pages/mentorship.page';
 
 test('Validate "Become a Mentee" section and Find a Mentor button', async ({
-  page, mentorshipPage, homePage
+  page,
+  mentorshipPage,
+  homePage,
 }) => {
   // Navigate to Mentorship page
   await page.goto('/mentorship');
@@ -22,7 +24,7 @@ test('Validate "Become a Mentee" section and Find a Mentor button', async ({
   ];
 
   await expect(mentorshipPage.menteeListItems).toHaveText(items);
-  
+
   await homePage.findMentorButton.click();
   await expect(page).toHaveURL(/\/mentorship\/mentors/);
 });
diff --git a/src/__tests__/pages/MenteeRegistrationPage.test.tsx b/src/__tests__/pages/MenteeRegistrationPage.test.tsx
index c46e2af..250016f 100644
--- a/src/__tests__/pages/MenteeRegistrationPage.test.tsx
+++ b/src/__tests__/pages/MenteeRegistrationPage.test.tsx
@@ -22,15 +22,18 @@ jest.mock('next/router', () => ({
   useRouter: () => ({ push: jest.fn(), pathname: '/' }),
 }));
 
-// Mutable flag so individual tests can override the registration state
+// Mutable flags so individual tests can override registration state
 let mockIsRegistrationOpen = true;
+let mockIsAdhocCycle = false;
 
-// Mock the registration toggle
 jest.mock('../../utils/mentorshipConstants', () => ({
   ...jest.requireActual('../../utils/mentorshipConstants'),
   get IS_REGISTRATION_OPEN() {
     return mockIsRegistrationOpen;
   },
+  get IS_ADHOC_CYCLE() {
+    return mockIsAdhocCycle;
+  },
 }));
 
 const renderPage = () =>
@@ -185,3 +188,112 @@ describe('MenteeRegistrationPage - registration closed', () => {
     expect(screen.queryByText('Step 1 of 3')).not.toBeInTheDocument();
   });
 });
+
+describe('MenteeRegistrationPage - adhoc cycle', () => {
+  beforeEach(() => {
+    mockIsAdhocCycle = true;
+    globalThis.fetch = jest.fn().mockResolvedValue({
+      ok: true,
+      json: jest.fn().mockResolvedValue([]),
+    });
+  });
+
+  afterEach(() => {
+    mockIsAdhocCycle = false;
+    jest.resetAllMocks();
+  });
+
+  it('shows ad-hoc breadcrumb label', () => {
+    renderPage();
+    expect(screen.getByText('Ad-hoc Mentee Registration')).toBeInTheDocument();
+  });
+
+  it('does not render available hours per month field', () => {
+    renderPage();
+    expect(screen.queryByPlaceholderText('e.g. 4')).not.toBeInTheDocument();
+  });
+
+  it('navigates to step 2 after filling required fields', async () => {
+    renderPage();
+
+    fireEvent.change(screen.getByPlaceholderText('Jane Doe'), {
+      target: { value: 'Jane Doe' },
+    });
+    fireEvent.change(screen.getByPlaceholderText('jane@example.com'), {
+      target: { value: 'jane@example.com' },
+    });
+    fireEvent.change(screen.getByPlaceholderText('@jane'), {
+      target: { value: '@jane' },
+    });
+
+    const countrySelect = screen.getByRole('combobox');
+    fireEvent.mouseDown(countrySelect);
+    const countryOption = await screen.findByRole('option', {
+      name: /United Kingdom/i,
+    });
+    fireEvent.click(countryOption);
+
+    fireEvent.change(screen.getByPlaceholderText('London'), {
+      target: { value: 'London' },
+    });
+    fireEvent.change(
+      screen.getByPlaceholderText('e.g. Frontend Developer, Student'),
+      { target: { value: 'Developer' } },
+    );
+    fireEvent.change(screen.getByPlaceholderText('Acme Corp'), {
+      target: { value: 'Tech Corp' },
+    });
+    fireEvent.change(
+      screen.getByPlaceholderText('https://www.linkedin.com/in/yourprofile'),
+      { target: { value: 'https://www.linkedin.com/in/janedoe' } },
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: /next/i }));
+
+    await waitFor(() => {
+      expect(screen.getByText('Step 2 of 3')).toBeInTheDocument();
+    });
+  });
+
+  it('shows mentorship goals field on step 2', async () => {
+    renderPage();
+
+    fireEvent.change(screen.getByPlaceholderText('Jane Doe'), {
+      target: { value: 'Jane Doe' },
+    });
+    fireEvent.change(screen.getByPlaceholderText('jane@example.com'), {
+      target: { value: 'jane@example.com' },
+    });
+    fireEvent.change(screen.getByPlaceholderText('@jane'), {
+      target: { value: '@jane' },
+    });
+
+    const countrySelect = screen.getByRole('combobox');
+    fireEvent.mouseDown(countrySelect);
+    const countryOption = await screen.findByRole('option', {
+      name: /United Kingdom/i,
+    });
+    fireEvent.click(countryOption);
+
+    fireEvent.change(screen.getByPlaceholderText('London'), {
+      target: { value: 'London' },
+    });
+    fireEvent.change(
+      screen.getByPlaceholderText('e.g. Frontend Developer, Student'),
+      { target: { value: 'Developer' } },
+    );
+    fireEvent.change(screen.getByPlaceholderText('Acme Corp'), {
+      target: { value: 'Tech Corp' },
+    });
+    fireEvent.change(
+      screen.getByPlaceholderText('https://www.linkedin.com/in/yourprofile'),
+      { target: { value: 'https://www.linkedin.com/in/janedoe' } },
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: /next/i }));
+
+    await waitFor(() => {
+      expect(screen.getByText('Mentorship goals *')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/src/__tests__/schemas/menteeSchema.test.ts b/src/__tests__/schemas/menteeSchema.test.ts
new file mode 100644
index 0000000..2e7a575
--- /dev/null
+++ b/src/__tests__/schemas/menteeSchema.test.ts
@@ -0,0 +1,107 @@
+import {
+  adhocMenteeFormDefaultValues,
+  menteeFormSchema,
+} from '../../schemas/menteeSchema';
+
+const validLongTermBase = {
+  fullName: 'Jane Doe',
+  position: 'Developer',
+  email: 'jane@example.com',
+  slackDisplayName: '@jane',
+  companyName: 'Acme Corp',
+  country: { countryCode: 'GB', countryName: 'United Kingdom' },
+  city: 'London',
+  linkedInProfile: 'https://www.linkedin.com/in/janedoe',
+  pronouns: '',
+  availableHsMonth: 4,
+  skills: {
+    yearsExperience: 2,
+    areas: [{ technicalArea: 'FRONTEND', proficiencyLevel: 'INTERMEDIATE' }],
+    languages: [{ language: 'TYPESCRIPT', proficiencyLevel: 'INTERMEDIATE' }],
+    mentorshipFocus: ['GROW_BEGINNER_TO_MID'],
+  },
+  spokenLanguages: ['English'],
+  bio: 'A'.repeat(50),
+  mentorshipType: 'LONG_TERM' as const,
+  applications: [{ mentorId: 1, priorityOrder: 1, whyMentor: 'A'.repeat(50) }],
+};
+
+const validAdhocBase = {
+  ...validLongTermBase,
+  mentorshipType: 'AD_HOC' as const,
+  availableHsMonth: 1,
+};
+
+describe('menteeFormSchema — long-term', () => {
+  it('accepts valid long-term data', () => {
+    const result = menteeFormSchema.safeParse(validLongTermBase);
+    expect(result.success).toBe(true);
+  });
+
+  it('rejects long-term data with no mentorshipFocus', () => {
+    const data = {
+      ...validLongTermBase,
+      skills: { ...validLongTermBase.skills, mentorshipFocus: [] },
+    };
+    const result = menteeFormSchema.safeParse(data);
+    expect(result.success).toBe(false);
+    if (!result.success) {
+      const paths = result.error.issues.map((i) => i.path.join('.'));
+      expect(paths).toContain('skills.mentorshipFocus');
+    }
+  });
+});
+
+describe('menteeFormSchema — adhoc', () => {
+  it('accepts valid adhoc data', () => {
+    const result = menteeFormSchema.safeParse(validAdhocBase);
+    expect(result.success).toBe(true);
+  });
+
+  it('requires mentorshipFocus for adhoc', () => {
+    const data = {
+      ...validAdhocBase,
+      skills: { ...validAdhocBase.skills, mentorshipFocus: [] },
+    };
+    const result = menteeFormSchema.safeParse(data);
+    expect(result.success).toBe(false);
+    if (!result.success) {
+      const paths = result.error.issues.map((i) => i.path.join('.'));
+      expect(paths).toContain('skills.mentorshipFocus');
+    }
+  });
+
+  it('accepts adhoc data with mentorshipFocus selected', () => {
+    const result = menteeFormSchema.safeParse(validAdhocBase);
+    expect(result.success).toBe(true);
+  });
+});
+
+describe('menteeFormSchema — availableHsMonth', () => {
+  it('rejects long-term data with availableHsMonth less than 2', () => {
+    const data = { ...validLongTermBase, availableHsMonth: 1 };
+    const result = menteeFormSchema.safeParse(data);
+    expect(result.success).toBe(false);
+    if (!result.success) {
+      const paths = result.error.issues.map((i) => i.path.join('.'));
+      expect(paths).toContain('availableHsMonth');
+    }
+  });
+
+  it('accepts long-term data with availableHsMonth of 2', () => {
+    const data = { ...validLongTermBase, availableHsMonth: 2 };
+    const result = menteeFormSchema.safeParse(data);
+    expect(result.success).toBe(true);
+  });
+
+  it('accepts adhoc data with availableHsMonth of 1', () => {
+    const result = menteeFormSchema.safeParse(validAdhocBase);
+    expect(result.success).toBe(true);
+  });
+});
+
+describe('adhocMenteeFormDefaultValues', () => {
+  it('sets mentorshipType to AD_HOC', () => {
+    expect(adhocMenteeFormDefaultValues.mentorshipType).toBe('AD_HOC');
+  });
+});
diff --git a/src/components/mentorship/MenteeStep1BasicInfo.tsx b/src/components/mentorship/MenteeStep1BasicInfo.tsx
index 64a70eb..978f803 100644
--- a/src/components/mentorship/MenteeStep1BasicInfo.tsx
+++ b/src/components/mentorship/MenteeStep1BasicInfo.tsx
@@ -2,6 +2,7 @@ import {
   FormControl,
   FormControlLabel,
   FormHelperText,
+  FormLabel,
   Grid,
   InputLabel,
   MenuItem,
@@ -20,7 +21,20 @@ import { COUNTRIES } from '@utils/mentorshipConstants';
 import { inputStyle } from './mentorshipStyles';
 import StepSection from './StepSection';
 
-const MenteeStep1BasicInfo = () => {
+const boolToRadioValue = (value: boolean | null | undefined): string => {
+  if (value === true) return 'yes';
+  if (value === false) return 'no';
+  if (value === null) return 'unspecified';
+  return '';
+};
+
+const radioValueToBool = (value: string): boolean | null => {
+  if (value === 'yes') return true;
+  if (value === 'no') return false;
+  return null;
+};
+
+const MenteeStep1BasicInfo = ({ isAdhoc = false }: { isAdhoc?: boolean }) => {
   const {
     register,
     control,
@@ -239,59 +253,76 @@ const MenteeStep1BasicInfo = () => {
         </Grid>
 
         <Grid item xs={12} md={6}>
-          <Typography
-            variant="subtitle2"
-            sx={{ mb: 0.5, color: 'text.primary' }}
-          >
-            Available hours per month *
-          </Typography>
           <Controller
-            name="availableHsMonth"
+            name="isWomen"
             control={control}
-            render={({ field, fieldState: { error } }) => (
-              <TextField
-                {...field}
-                type="number"
-                fullWidth
-                placeholder="e.g. 4"
-                error={!!error}
-                helperText={
-                  error?.message ?? 'How many hours can you dedicate per month?'
-                }
-                onChange={(e) => field.onChange(parseInt(e.target.value) || 0)}
-                sx={inputStyle}
-              />
+            render={({ field }) => (
+              <FormControl component="fieldset">
+                <FormLabel
+                  component="legend"
+                  sx={{
+                    mb: 0.5,
+                    color: 'text.primary',
+                    typography: 'subtitle2',
+                  }}
+                >
+                  Do you identify as a woman or non-binary?
+                </FormLabel>
+                <RadioGroup
+                  row
+                  value={boolToRadioValue(field.value)}
+                  onChange={(e) => {
+                    field.onChange(radioValueToBool(e.target.value));
+                  }}
+                >
+                  <FormControlLabel
+                    value="yes"
+                    control={<Radio />}
+                    label="Yes"
+                  />
+                  <FormControlLabel value="no" control={<Radio />} label="No" />
+                  <FormControlLabel
+                    value="unspecified"
+                    control={<Radio />}
+                    label="Prefer not to say"
+                  />
+                </RadioGroup>
+              </FormControl>
             )}
           />
         </Grid>
 
-        <Grid item xs={12}>
-          <FormControl>
+        {!isAdhoc && (
+          <Grid item xs={12} md={6}>
             <Typography
               variant="subtitle2"
               sx={{ mb: 0.5, color: 'text.primary' }}
             >
-              Mentorship type
+              Available hours per month *
             </Typography>
-            <RadioGroup row value="LONG_TERM">
-              <FormControlLabel
-                value="LONG_TERM"
-                control={<Radio />}
-                label="Long-term"
-                disabled
-              />
-              <FormControlLabel
-                value="AD_HOC"
-                control={<Radio />}
-                label="Ad-hoc (coming soon)"
-                disabled
-              />
-            </RadioGroup>
-            <FormHelperText>
-              Only long-term mentorship is available for this month.
-            </FormHelperText>
-          </FormControl>
-        </Grid>
+            <Controller
+              name="availableHsMonth"
+              control={control}
+              render={({ field, fieldState: { error } }) => (
+                <TextField
+                  {...field}
+                  type="number"
+                  fullWidth
+                  placeholder="e.g. 4"
+                  error={!!error}
+                  helperText={
+                    error?.message ??
+                    'How many hours can you dedicate per month?'
+                  }
+                  onChange={(e) =>
+                    field.onChange(Number.parseInt(e.target.value) || 0)
+                  }
+                  sx={inputStyle}
+                />
+              )}
+            />
+          </Grid>
+        )}
       </Grid>
     </StepSection>
   );
diff --git a/src/components/mentorship/MenteeStep2Skills.tsx b/src/components/mentorship/MenteeStep2Skills.tsx
index d87a139..8739a6f 100644
--- a/src/components/mentorship/MenteeStep2Skills.tsx
+++ b/src/components/mentorship/MenteeStep2Skills.tsx
@@ -28,19 +28,25 @@ import StepSection from './StepSection';
 
 const EXPERIENCE_OPTIONS = MENTEE_EXPERIENCE_OPTIONS;
 
-const MenteeStep2Skills = () => {
+interface Props {
+  isAdhoc?: boolean;
+}
+
+const MenteeStep2Skills = ({ isAdhoc = false }: Props) => {
   const {
     control,
     register,
     formState: { errors },
   } = useFormContext();
 
-  const skillsErrors = errors.skills as any;
-
   return (
     <StepSection
       title="Skills & Experience"
-      description="Tell us about your technical background so we can help match you with the right mentor."
+      description={
+        isAdhoc
+          ? "Tell us about your technical background and what you'd like to focus on in your session."
+          : 'Tell us about your technical background so we can help match you with the right mentor.'
+      }
     >
       <Grid container spacing={3}>
         {/* Years of experience */}
@@ -92,9 +98,6 @@ const MenteeStep2Skills = () => {
             groups={TECHNICAL_AREA_GROUPS}
             proficiencyLevels={PROFICIENCY_LEVELS}
           />
-          {skillsErrors?.areas && (
-            <FormHelperText error>{skillsErrors.areas.message}</FormHelperText>
-          )}
         </Grid>
 
         {/* Programming languages with proficiency */}
@@ -110,63 +113,60 @@ const MenteeStep2Skills = () => {
             languages={CODE_LANGUAGES}
             proficiencyLevels={PROFICIENCY_LEVELS}
           />
-          {skillsErrors?.languages && (
-            <FormHelperText error>
-              {skillsErrors.languages.message}
-            </FormHelperText>
-          )}
         </Grid>
 
-        {/* Mentorship focus */}
+        {/* Mentorship goals */}
         <Grid item xs={12}>
-          <Typography
-            variant="subtitle2"
-            sx={{ fontWeight: 600, mb: 1, color: 'text.primary' }}
-          >
-            Mentorship goals *
-          </Typography>
-          <Typography variant="body2" color="text.secondary" sx={{ mb: 1 }}>
-            Select the goals you want to achieve through mentorship.
-          </Typography>
-          <Controller
-            name="skills.mentorshipFocus"
-            control={control}
-            defaultValue={[]}
-            render={({ field, fieldState: { error } }) => (
-              <Box>
-                <FormGroup>
-                  {MENTORSHIP_FOCUS_AREAS.map((area) => (
-                    <FormControlLabel
-                      key={area.value}
-                      control={
-                        <Checkbox
-                          checked={field.value?.includes(area.value) ?? false}
-                          onChange={(e) => {
-                            if (e.target.checked) {
-                              field.onChange([
-                                ...(field.value ?? []),
-                                area.value,
-                              ]);
-                            } else {
-                              field.onChange(
-                                (field.value ?? []).filter(
-                                  (v: string) => v !== area.value,
-                                ),
-                              );
-                            }
-                          }}
-                        />
-                      }
-                      label={area.label}
-                    />
-                  ))}
-                </FormGroup>
-                {error && (
-                  <FormHelperText error>{error.message}</FormHelperText>
-                )}
-              </Box>
-            )}
-          />
+          <>
+            <Typography
+              variant="subtitle2"
+              sx={{ fontWeight: 600, mb: 1, color: 'text.primary' }}
+            >
+              Mentorship goals *
+            </Typography>
+            <Typography variant="body2" color="text.secondary" sx={{ mb: 1 }}>
+              Select the goals you want to achieve through mentorship.
+            </Typography>
+            <Controller
+              name="skills.mentorshipFocus"
+              control={control}
+              defaultValue={[]}
+              render={({ field, fieldState: { error } }) => (
+                <Box>
+                  <FormGroup>
+                    {MENTORSHIP_FOCUS_AREAS.map((area) => (
+                      <FormControlLabel
+                        key={area.value}
+                        control={
+                          <Checkbox
+                            checked={field.value?.includes(area.value) ?? false}
+                            onChange={(e) => {
+                              if (e.target.checked) {
+                                field.onChange([
+                                  ...(field.value ?? []),
+                                  area.value,
+                                ]);
+                              } else {
+                                field.onChange(
+                                  (field.value ?? []).filter(
+                                    (v: string) => v !== area.value,
+                                  ),
+                                );
+                              }
+                            }}
+                          />
+                        }
+                        label={area.label}
+                      />
+                    ))}
+                  </FormGroup>
+                  {error && (
+                    <FormHelperText error>{error.message}</FormHelperText>
+                  )}
+                </Box>
+              )}
+            />
+          </>
         </Grid>
 
         {/* Spoken languages */}
diff --git a/src/pages/api/mentors.ts b/src/pages/api/mentors.ts
index 5ff6ce2..6c8bc7e 100644
--- a/src/pages/api/mentors.ts
+++ b/src/pages/api/mentors.ts
@@ -41,6 +41,11 @@ export default async function handler(
         Array.isArray(language) ? language[0] : language,
       );
     if (focus) params.append('focus', Array.isArray(focus) ? focus[0] : focus);
+    if (mentorshipTypes)
+      params.append(
+        'mentorshipTypes',
+        Array.isArray(mentorshipTypes) ? mentorshipTypes[0] : mentorshipTypes,
+      );
 
     const data = await proxyRequest('mentorship/mentors', {
       method: 'GET',
diff --git a/src/pages/mentorship/mentee-registration.tsx b/src/pages/mentorship/mentee-registration.tsx
index ac85c4b..85c91a2 100644
--- a/src/pages/mentorship/mentee-registration.tsx
+++ b/src/pages/mentorship/mentee-registration.tsx
@@ -17,6 +17,7 @@ import React, { useEffect, useState } from 'react';
 import { FormProvider, UseFormReturn, useForm } from 'react-hook-form';
 
 import {
+  adhocMenteeFormDefaultValues,
   menteeFormDefaultValues,
   menteeFormSchema,
   MenteeFormData,
@@ -26,10 +27,36 @@ import MenteeStep2Skills from 'components/mentorship/MenteeStep2Skills';
 import MenteeStep3Applications from 'components/mentorship/MenteeStep3Applications';
 import { MentorOption } from 'components/mentorship/MentorApplicationCard';
 import RegistrationClosed from 'components/mentorship/RegistrationClosed';
-import { IS_REGISTRATION_OPEN } from 'utils/mentorshipConstants';
+import {
+  IS_ADHOC_CYCLE,
+  IS_REGISTRATION_OPEN,
+} from 'utils/mentorshipConstants';
 
 const TOTAL_STEPS = 3;
 
+const postMenteeRegistration = async (
+  payload: unknown,
+): Promise<string | null> => {
+  try {
+    const response = await fetch('/api/mentee-registration', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(payload),
+    });
+    if (!response.ok) {
+      const body = await response.json().catch(() => null);
+      return (
+        body?.message ??
+        body?.error ??
+        'Something went wrong. Please try again.'
+      );
+    }
+    return null;
+  } catch {
+    return 'Network error. Please check your connection and try again.';
+  }
+};
+
 const validateStep1 = async (formMethods: UseFormReturn<MenteeFormData>) =>
   formMethods.trigger([
     'fullName',
@@ -40,8 +67,6 @@ const validateStep1 = async (formMethods: UseFormReturn<MenteeFormData>) =>
     'position',
     'companyName',
     'linkedInProfile',
-    'availableHsMonth',
-    'mentorshipType',
   ]);
 
 const validateStep2 = async (formMethods: UseFormReturn<MenteeFormData>) =>
@@ -54,14 +79,27 @@ const validateStep2 = async (formMethods: UseFormReturn<MenteeFormData>) =>
     'bio',
   ]);
 
+const getStepValidator = (
+  step: number,
+  formMethods: UseFormReturn<MenteeFormData>,
+): Promise<boolean> => {
+  if (step === 1) return validateStep1(formMethods);
+  if (step === 2) return validateStep2(formMethods);
+  return Promise.resolve(true);
+};
+
+// NOSONAR
 const MenteeRegistrationPage = () => {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down('md'));
   const registrationOpen = IS_REGISTRATION_OPEN;
+  const isAdhoc = IS_ADHOC_CYCLE;
 
   const formMethods = useForm<MenteeFormData>({
     resolver: zodResolver(menteeFormSchema),
-    defaultValues: menteeFormDefaultValues,
+    defaultValues: isAdhoc
+      ? adhocMenteeFormDefaultValues
+      : menteeFormDefaultValues,
     mode: 'onChange',
   });
 
@@ -72,7 +110,8 @@ const MenteeRegistrationPage = () => {
 
   useEffect(() => {
     if (!registrationOpen) return;
-    fetch('/api/mentors')
+    const mentorshipTypeParam = isAdhoc ? 'Ad-Hoc' : 'Long-Term';
+    fetch(`/api/mentors?mentorshipTypes=${mentorshipTypeParam}`)
       .then((res) => res.json())
       .then((data) => {
         const mentorList: MentorOption[] = (data.mentors ?? data ?? []).map(
@@ -87,14 +126,10 @@ const MenteeRegistrationPage = () => {
       .catch(() => {
         // silently fall back to empty list — user can still submit if API is down
       });
-  }, [registrationOpen]);
+  }, [registrationOpen, isAdhoc]);
 
   const handleNext = async () => {
-    let isValid;
-    if (activeStep === 1) isValid = await validateStep1(formMethods);
-    else if (activeStep === 2) isValid = await validateStep2(formMethods);
-    else isValid = true;
-
+    const isValid = await getStepValidator(activeStep, formMethods);
     if (isValid && activeStep < TOTAL_STEPS) {
       setActiveStep((prev) => prev + 1);
       window.scrollTo(0, 0);
@@ -111,7 +146,7 @@ const MenteeRegistrationPage = () => {
   const onSubmit = async (data: MenteeFormData) => {
     setSubmitError(null);
 
-    const networkLinks = data.network ?? [];
+    const networkLinks = [...(data.network ?? [])];
     if (data.linkedInProfile) {
       networkLinks.push({
         type: 'LINKEDIN' as const,
@@ -127,9 +162,9 @@ const MenteeRegistrationPage = () => {
         slackDisplayName: data.slackDisplayName,
         country: data.country ?? { countryCode: '', countryName: '' },
         city: data.city,
-        companyName: data.companyName ?? '',
+        companyName: data.companyName,
         pronouns: data.pronouns ?? '',
-        pronounCategory: data.pronounCategory,
+
         isWomen: data.isWomen,
         images: [],
         network: networkLinks,
@@ -147,30 +182,13 @@ const MenteeRegistrationPage = () => {
       })),
     };
 
-    try {
-      const response = await fetch('/api/mentee-registration', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(payload),
-      });
-
-      if (!response.ok) {
-        const body = await response.json().catch(() => null);
-        const message =
-          body?.message ??
-          body?.error ??
-          'Something went wrong. Please try again.';
-        setSubmitError(message);
-        return;
-      }
-
-      setSubmitted(true);
-      window.scrollTo(0, 0);
-    } catch {
-      setSubmitError(
-        'Network error. Please check your connection and try again.',
-      );
+    const error = await postMenteeRegistration(payload);
+    if (error) {
+      setSubmitError(error);
+      return;
     }
+    setSubmitted(true);
+    window.scrollTo(0, 0);
   };
 
   return (
@@ -189,7 +207,9 @@ const MenteeRegistrationPage = () => {
           <Link href="/mentorship" color="primary" underline="always">
             Mentorship
           </Link>
-          <Typography color="text.primary">Mentee Registration</Typography>
+          <Typography color="text.primary">
+            {isAdhoc ? 'Ad-hoc Mentee Registration' : 'Mentee Registration'}
+          </Typography>
         </Breadcrumbs>
       </Box>
 
@@ -212,12 +232,14 @@ const MenteeRegistrationPage = () => {
               px: { xs: 2, sm: 3 },
               maxWidth: isMobile ? '100%' : theme.custom?.innerBox?.maxWidth,
               margin: '0 auto',
-              ...(!registrationOpen && {
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'center',
-                minHeight: '70vh',
-              }),
+              ...(registrationOpen
+                ? {
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    minHeight: '70vh',
+                  }
+                : {}),
             }}
           >
             <Box
@@ -260,8 +282,9 @@ const MenteeRegistrationPage = () => {
                     color="text.secondary"
                     sx={{ mb: 3 }}
                   >
-                    Thank you for applying to our mentorship programme. We will
-                    review your application and get back to you soon.
+                    {isAdhoc
+                      ? 'Thank you for applying to our ad-hoc mentorship programme. We will review your application and get back to you soon.'
+                      : 'Thank you for applying to our mentorship programme. We will review your application and get back to you soon.'}
                   </Typography>
                   <Button
                     variant="contained"
@@ -304,8 +327,12 @@ const MenteeRegistrationPage = () => {
 
                   {/* Step content */}
                   <Box>
-                    {activeStep === 1 && <MenteeStep1BasicInfo />}
-                    {activeStep === 2 && <MenteeStep2Skills />}
+                    {activeStep === 1 && (
+                      <MenteeStep1BasicInfo isAdhoc={isAdhoc} />
+                    )}
+                    {activeStep === 2 && (
+                      <MenteeStep2Skills isAdhoc={isAdhoc} />
+                    )}
                     {activeStep === 3 && (
                       <MenteeStep3Applications mentors={mentors} />
                     )}
diff --git a/src/schemas/menteeSchema.ts b/src/schemas/menteeSchema.ts
index 5b1559a..1b9d305 100644
--- a/src/schemas/menteeSchema.ts
+++ b/src/schemas/menteeSchema.ts
@@ -16,9 +16,7 @@ const skillsSchema = z.object({
   languages: z
     .array(languageProficiencySchema)
     .min(1, 'Select at least one programming language'),
-  mentorshipFocus: z
-    .array(mentorshipFocusAreaSchema)
-    .min(1, 'Select at least one focus area'),
+  mentorshipFocus: z.array(mentorshipFocusAreaSchema),
 });
 
 const applicationSchema = z.object({
@@ -30,47 +28,61 @@ const applicationSchema = z.object({
   applicationMessage: z.string().optional(),
 });
 
-export const menteeFormSchema = z.object({
-  fullName: z.string().min(2, 'Name must be at least 2 characters'),
-  position: z.string().min(1, 'Position is required'),
-  email: z.email('Please enter a valid email address'),
-  slackDisplayName: z
-    .string()
-    .min(2, 'Slack display name is required')
-    .regex(/^@/, 'Slack name must start with @'),
-  companyName: z.string().min(1, 'Company name is required'),
-  country: countrySchema,
-  city: z.string().min(1, 'Please enter your city'),
-  linkedInProfile: z.url('Please enter a valid LinkedIn URL'),
-  pronouns: z.string(),
-  isWomen: z.boolean({ error: 'Please select an option' }).optional(),
-  pronounCategory: z
-    .enum([
-      'FEMININE',
-      'MASCULINE',
-      'NEUTRAL',
-      'MULTIPLE',
-      'NEOPRONOUNS',
-      'ANY',
-      'UNSPECIFIED',
-    ])
-    .optional(),
-  availableHsMonth: z
-    .number()
-    .min(1, 'Please enter at least 2 hours per month')
-    .max(224, 'Maximum 224 hours per month'),
-  skills: skillsSchema,
-  spokenLanguages: z
-    .array(z.string())
-    .min(1, 'Select at least one spoken language'),
-  bio: z.string().min(50, 'Bio must be at least 50 characters'),
-  network: z.array(networkSchema).optional(),
-  mentorshipType: z.enum(['AD_HOC', 'LONG_TERM']),
-  applications: z
-    .array(applicationSchema)
-    .min(1, 'Please select at least one mentor')
-    .max(5, 'Maximum 5 mentor selections'),
-});
+export const menteeFormSchema = z
+  .object({
+    fullName: z.string().min(2, 'Name must be at least 2 characters'),
+    position: z.string().min(1, 'Position is required'),
+    email: z.email('Please enter a valid email address'),
+    slackDisplayName: z
+      .string()
+      .min(2, 'Slack display name is required')
+      .regex(/^@/, 'Slack name must start with @'),
+    companyName: z.string().min(1, 'Company name is required'),
+    country: countrySchema,
+    city: z.string().min(1, 'Please enter your city'),
+    linkedInProfile: z.url('Please enter a valid LinkedIn URL'),
+    pronouns: z.string(),
+    isWomen: z.boolean().nullable().optional(),
+
+    availableHsMonth: z.number().min(0).max(224, 'Maximum 224 hours per month'),
+    skills: skillsSchema,
+    spokenLanguages: z
+      .array(z.string())
+      .min(1, 'Select at least one spoken language'),
+    bio: z.string().min(50, 'Bio must be at least 50 characters'),
+    network: z.array(networkSchema).optional(),
+    mentorshipType: z.enum(['AD_HOC', 'LONG_TERM']),
+    applications: z
+      .array(applicationSchema)
+      .min(1, 'Please select at least one mentor')
+      .max(5, 'Maximum 5 mentor selections'),
+  })
+  .superRefine((data, ctx) => {
+    if (
+      !data.skills.mentorshipFocus ||
+      data.skills.mentorshipFocus.length === 0
+    ) {
+      ctx.addIssue({
+        code: 'custom',
+        message: 'Select at least one focus area',
+        path: ['skills', 'mentorshipFocus'],
+      });
+    }
+    if (data.mentorshipType === 'AD_HOC' && data.availableHsMonth < 1) {
+      ctx.addIssue({
+        code: 'custom',
+        message: 'Please enter at least 1 hour per month',
+        path: ['availableHsMonth'],
+      });
+    }
+    if (data.mentorshipType === 'LONG_TERM' && data.availableHsMonth < 2) {
+      ctx.addIssue({
+        code: 'custom',
+        message: 'Please enter at least 2 hours per month',
+        path: ['availableHsMonth'],
+      });
+    }
+  });
 
 export type MenteeFormData = z.infer<typeof menteeFormSchema>;
 
@@ -97,3 +109,9 @@ export const menteeFormDefaultValues: Partial<MenteeFormData> = {
   mentorshipType: 'LONG_TERM',
   applications: [],
 };
+
+export const adhocMenteeFormDefaultValues: Partial<MenteeFormData> = {
+  ...menteeFormDefaultValues,
+  mentorshipType: 'AD_HOC',
+  availableHsMonth: 1,
+};
diff --git a/src/utils/mentorshipConstants.ts b/src/utils/mentorshipConstants.ts
index dc7fecf..ee49a09 100644
--- a/src/utils/mentorshipConstants.ts
+++ b/src/utils/mentorshipConstants.ts
@@ -208,4 +208,10 @@ export const PREFERENCE_LEVELS = ['Low', 'Medium', 'High', 'Not Applicable'];
  * Mentee registration toggle.
  * Set to `true` to open the registration form, `false` to show the closed page.
  */
-export const IS_REGISTRATION_OPEN = false;
+export const IS_REGISTRATION_OPEN = true;
+
+/**
+ * Mentorship cycle type toggle.
+ * Set to `true` for an ad-hoc cycle, `false` for a long-term cycle.
+ */
+export const IS_ADHOC_CYCLE = true;