diff --git a/src/api/client.test.ts b/src/api/client.test.ts
new file mode 100644
index 00000000..3c899f06
--- /dev/null
+++ b/src/api/client.test.ts
@@ -0,0 +1,38 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { ApiError, apiClient } from "./client";
+
+describe("apiClient expected errors", () => {
+  afterEach(() => {
+    vi.unstubAllGlobals();
+    vi.unstubAllEnvs();
+    vi.restoreAllMocks();
+  });
+
+  it("does not log an expected business-error status", async () => {
+    vi.stubEnv("NODE_ENV", "development");
+    vi.stubGlobal(
+      "fetch",
+      vi.fn().mockResolvedValue(
+        new Response(
+          JSON.stringify({
+            hasError: true,
+            statusCode: 400,
+            message: { general: ["No mentor request found for your account."] },
+          }),
+          { status: 400, headers: { "Content-Type": "application/json" } },
+        ),
+      ),
+    );
+    const consoleError = vi.spyOn(console, "error").mockImplementation(() => {
+      // Expected application states should not appear as console failures.
+    });
+
+    await expect(
+      apiClient.get("/api/v1/dashboard/mentor/status/", undefined, {
+        expectedErrorStatuses: [400],
+      }),
+    ).rejects.toBeInstanceOf(ApiError);
+
+    expect(consoleError).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/api/client.ts b/src/api/client.ts
index 382bf484..ad6b579e 100644
--- a/src/api/client.ts
+++ b/src/api/client.ts
@@ -66,6 +66,8 @@ interface RequestOptions<T> {
   isFormData?: boolean;
   /** When true, a 403 throws ApiError instead of the auth flow. */
   skipAuthRedirectOn403?: boolean;
+  /** Statuses that represent an expected UI state and should not be logged. */
+  expectedErrorStatuses?: readonly number[];
   /** When true, a Zod parse failure throws instead of returning raw. */
   strictSchema?: boolean;
 }
@@ -75,6 +77,7 @@ type ClientOptions = {
   responseType?: "json" | "blob";
   isFormData?: boolean;
   skipAuthRedirectOn403?: boolean;
+  expectedErrorStatuses?: readonly number[];
   strictSchema?: boolean;
 };
 
@@ -208,7 +211,10 @@ async function request<T>(
       extractDjangoMessage(rawData) ??
       "Something went wrong. Please try again.";
     const error = new ApiError(res.status, backendMsg, rawData);
-    if (process.env.NODE_ENV === "development") {
+    if (
+      process.env.NODE_ENV === "development" &&
+      !options.expectedErrorStatuses?.includes(res.status)
+    ) {
       console.error(
         `[API Client] Business error: [Status ${res.status}] ${endpoint}\nMessage: ${backendMsg}`,
         rawData,
@@ -222,7 +228,10 @@ async function request<T>(
       extractDjangoMessage(rawData) ??
       "Something went wrong. Please try again.";
     const error = new ApiError(res.status, backendMsg, rawData);
-    if (process.env.NODE_ENV === "development") {
+    if (
+      process.env.NODE_ENV === "development" &&
+      !options.expectedErrorStatuses?.includes(res.status)
+    ) {
       console.error(
         `[API Client] HTTP error: [Status ${res.status}] ${endpoint}\nMessage: ${backendMsg}`,
         rawData,
diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts
index b9af89d9..1e308ecb 100644
--- a/src/api/endpoints.ts
+++ b/src/api/endpoints.ts
@@ -355,6 +355,10 @@ export const endpoints = {
     // ── Activity feed ────────────────────────────────────────────────────
     /** GET - Merged timeline: sessions created + task submissions appraised */
     activity: "/api/v1/dashboard/mentor/activity/",
+
+    // ── Company affiliation change ────────────────────────────────────────
+    /** POST - Request a company affiliation change (pending admin approval) */
+    changeCompany: "/api/v1/dashboard/mentor/change-company/",
   },
 
   // ============================================
diff --git a/src/components/ui/multi-select.tsx b/src/components/ui/multi-select.tsx
index 838881a2..8a9f95c2 100644
--- a/src/components/ui/multi-select.tsx
+++ b/src/components/ui/multi-select.tsx
@@ -2,6 +2,7 @@
 
 import { Check, ChevronDown, X } from "lucide-react";
 import * as React from "react";
+import { toast } from "sonner";
 import { cn } from "@/lib/utils";
 import { Badge } from "./badge";
 
@@ -17,6 +18,8 @@ interface MultiSelectProps {
   placeholder?: string;
   disabled?: boolean;
   className?: string;
+  maxSelections?: number;
+  minSelections?: number;
 }
 
 export function MultiSelect({
@@ -26,6 +29,8 @@ export function MultiSelect({
   placeholder = "Select options...",
   disabled = false,
   className,
+  maxSelections,
+  minSelections,
 }: MultiSelectProps) {
   const [open, setOpen] = React.useState(false);
   const [search, setSearch] = React.useState("");
@@ -42,6 +47,14 @@ export function MultiSelect({
     if (value.includes(optValue)) {
       onChange(value.filter((v) => v !== optValue));
     } else {
+      if (maxSelections !== undefined && value.length >= maxSelections) {
+        toast.error(
+          `You can select a maximum of ${maxSelections} Interest Group${
+            maxSelections === 1 ? "" : "s"
+          }.`,
+        );
+        return;
+      }
       onChange([...value, optValue]);
     }
   };
@@ -91,19 +104,26 @@ export function MultiSelect({
         {selectedLabels.length === 0 ? (
           <span className="text-muted-foreground flex-1">{placeholder}</span>
         ) : (
-          selectedLabels.map((o) => (
-            <Badge key={o.value} variant="secondary" className="gap-1 pr-1">
-              {o.label}
-              <button
-                type="button"
-                aria-label={`Remove ${o.label}`}
-                onClick={(e) => remove(o.value, e)}
-                className="rounded-sm opacity-60 hover:opacity-100 cursor-pointer"
-              >
-                <X className="h-3 w-3" />
-              </button>
-            </Badge>
-          ))
+          <>
+            {selectedLabels.map((o) => (
+              <Badge key={o.value} variant="secondary" className="gap-1 pr-1">
+                {o.label}
+                <button
+                  type="button"
+                  aria-label={`Remove ${o.label}`}
+                  onClick={(e) => remove(o.value, e)}
+                  className="rounded-sm opacity-60 hover:opacity-100 cursor-pointer"
+                >
+                  <X className="h-3 w-3" />
+                </button>
+              </Badge>
+            ))}
+            {maxSelections !== undefined && (
+              <span className="ml-auto text-xs text-muted-foreground whitespace-nowrap">
+                {value.length}/{maxSelections}
+              </span>
+            )}
+          </>
         )}
         <ChevronDown
           className={cn(
@@ -131,15 +151,22 @@ export function MultiSelect({
             ) : (
               filtered.map((o) => {
                 const selected = value.includes(o.value);
+                const atMax =
+                  maxSelections !== undefined &&
+                  value.length >= maxSelections &&
+                  !selected;
                 return (
                   <button
                     key={o.value}
                     type="button"
                     onClick={() => toggle(o.value)}
+                    disabled={atMax}
                     className={cn(
                       "flex w-full items-center gap-2 rounded-sm px-3 py-2 text-sm outline-none transition-colors",
                       "hover:bg-accent hover:text-accent-foreground",
                       selected && "bg-accent/50",
+                      atMax &&
+                        "opacity-40 cursor-not-allowed hover:bg-transparent hover:text-current",
                     )}
                   >
                     <Check
diff --git a/src/features/home/components/event-calendar-card.tsx b/src/features/home/components/event-calendar-card.tsx
index 3de3947c..afed76c9 100644
--- a/src/features/home/components/event-calendar-card.tsx
+++ b/src/features/home/components/event-calendar-card.tsx
@@ -286,40 +286,42 @@ export function EventCalendarCard({
               {format(selectedDate, "EEEE, MMM d")}
             </p>
             <div className="max-h-36 space-y-1.5 overflow-y-auto scrollbar-none">
-              {selectedDateEvents.map((event) => (
-                <div
-                  key={event.id}
-                  className="flex items-center gap-2.5 rounded-xl bg-card p-2.5 transition-all hover:-translate-y-0.5"
-                >
-                  <div
+              {selectedDateEvents.map((event) => {
+                const Wrapper = event.link ? "a" : "div";
+                return (
+                  <Wrapper
+                    key={event.id}
+                    href={event.link}
                     className={cn(
-                      "size-2 shrink-0 rounded-full",
-                      getEventBg(event.type ?? "other"),
+                      "group flex items-center gap-2.5 rounded-xl bg-card p-2.5 transition-all hover:-translate-y-0.5",
+                      event.link && "cursor-pointer hover:bg-accent/50",
                     )}
-                  />
-                  <div className="min-w-0 flex-1">
-                    <p className="truncate text-xs font-medium text-foreground">
-                      {event.title}
-                    </p>
-                    {event.location && (
-                      <p className="flex items-center gap-1 text-[10px] text-muted-foreground">
-                        <MapPin className="size-2.5" />
-                        {event.location}
+                  >
+                    <div
+                      className={cn(
+                        "size-2 shrink-0 rounded-full",
+                        getEventBg(event.type ?? "other"),
+                      )}
+                    />
+                    <div className="min-w-0 flex-1">
+                      <p className="truncate text-xs font-medium text-foreground group-hover:text-primary transition-colors">
+                        {event.title}
                       </p>
+                      {event.location && (
+                        <p className="flex items-center gap-1 text-[10px] text-muted-foreground">
+                          <MapPin className="size-2.5" />
+                          {event.location}
+                        </p>
+                      )}
+                    </div>
+                    {event.link && (
+                      <div className="shrink-0 text-primary transition-colors opacity-70 group-hover:opacity-100">
+                        <ExternalLink className="size-3.5" />
+                      </div>
                     )}
-                  </div>
-                  {event.link && (
-                    <a
-                      href={event.link}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="shrink-0 text-primary transition-colors hover:text-primary/80"
-                    >
-                      <ExternalLink className="size-3.5" />
-                    </a>
-                  )}
-                </div>
-              ))}
+                  </Wrapper>
+                );
+              })}
             </div>
           </div>
         ) : (
diff --git a/src/features/home/components/mentor-home.tsx b/src/features/home/components/mentor-home.tsx
index 238c4991..fed42e4d 100644
--- a/src/features/home/components/mentor-home.tsx
+++ b/src/features/home/components/mentor-home.tsx
@@ -8,6 +8,7 @@ import {
   Loader2,
   XCircle,
 } from "lucide-react";
+import Link from "next/link";
 import { useEffect, useState } from "react";
 import { toast } from "sonner";
 
@@ -29,6 +30,7 @@ import {
   useMentorApplication,
   useMentorProfile,
 } from "@/features/mentor/onboarding/hooks/use-onboarding";
+import { useMentorTasks } from "@/features/mentor/tasks/hooks/use-mentor-tasks";
 import type { WeeklySchedule } from "@/features/mentor/types";
 import { useDashboardCalendar, useMentorSessions } from "../hooks";
 import { flattenDashboardCalendar } from "../utils";
@@ -77,6 +79,14 @@ export function MentorHome() {
     useAvailabilitySlots();
   const { mutate: saveSchedule, isPending: isSaving } =
     useCreateAvailabilitySlots();
+
+  const {
+    data: mentorPendingTasksResult,
+    isLoading: mentorPendingTasksLoading,
+  } = useMentorTasks({
+    approval_status: "pending",
+  });
+  const mentorPendingTasksCount = mentorPendingTasksResult?.data?.length ?? 0;
   const [calendarMonth, setCalendarMonth] = useState(new Date());
   const { data: calendarData, isLoading: loadingCalendar } =
     useDashboardCalendar({
@@ -171,6 +181,15 @@ export function MentorHome() {
   // Pending review: say exactly who acts next instead of a blank page.
   // (Rejected applications already returned above with the rejection banner + reapply form.)
   if (!isVerified) {
+    const companyName = application?.organization?.trim();
+    const isIgMentor = application?.mentor_tier === "IG_MENTOR";
+    const isCompanyMentor =
+      application?.mentor_tier === "COMPANY_MENTOR" ||
+      (!isIgMentor && companyName);
+
+    const mentorRole = isCompanyMentor ? "Company Mentor" : "IG Mentor";
+    const displayCompany = isCompanyMentor && companyName;
+
     return (
       <div className="mx-auto max-w-2xl py-8">
         <Card>
@@ -181,15 +200,20 @@ export function MentorHome() {
             </CardTitle>
           </CardHeader>
           <CardContent className="space-y-2 text-sm text-muted-foreground">
-            {application?.organization && (
-              <p>
-                Applying as{" "}
-                <span className="font-medium text-foreground">
-                  {application.organization}
-                </span>
-                .
-              </p>
-            )}
+            <p>
+              Applying as{" "}
+              <span className="font-medium text-foreground">{mentorRole}</span>
+              {displayCompany ? (
+                <>
+                  {" "}
+                  on behalf of{" "}
+                  <span className="font-medium text-foreground">
+                    {companyName}
+                  </span>
+                </>
+              ) : null}
+              .
+            </p>
             <p>
               A platform admin reviews it next — you&apos;ll be notified once a
               decision is made. You can keep using μLearn as a learner in the
@@ -326,32 +350,39 @@ export function MentorHome() {
 
       <div className="grid grid-cols-1 gap-5 lg:grid-cols-2">
         {/* Task Requests */}
-        <Card className="rounded-2xl border bg-card shadow-sm">
-          <CardHeader className="px-5 py-4">
-            <div className="flex flex-row items-center gap-2.5">
-              <div className="flex size-9 items-center justify-center rounded-xl bg-warning/10">
-                <BookOpen className="size-4 text-warning" />
-              </div>
-              <CardTitle className="text-base font-bold text-foreground">
-                Task Requests
-              </CardTitle>
-            </div>
-          </CardHeader>
-          <CardContent className="px-5 pb-5 pt-0">
-            {overviewLoading ? (
-              <Skeleton className="h-12 w-full rounded-lg" />
-            ) : (
-              <div className="flex gap-4 text-sm">
-                <div className="text-center">
-                  <p className="text-2xl font-bold text-warning">—</p>
-                  <p className="text-[11px] text-muted-foreground uppercase tracking-wide">
-                    Pending
-                  </p>
+        <Link
+          href="/dashboard/mentor/task-requests?tab=pending"
+          className="block"
+        >
+          <Card className="h-full rounded-2xl border bg-card shadow-sm transition-colors hover:bg-muted/50 cursor-pointer">
+            <CardHeader className="px-5 py-4">
+              <div className="flex flex-row items-center gap-2.5">
+                <div className="flex size-9 items-center justify-center rounded-xl bg-warning/10">
+                  <BookOpen className="size-4 text-warning" />
                 </div>
+                <CardTitle className="text-base font-bold text-foreground">
+                  Task Requests
+                </CardTitle>
               </div>
-            )}
-          </CardContent>
-        </Card>
+            </CardHeader>
+            <CardContent className="px-5 pb-5 pt-0">
+              {mentorPendingTasksLoading ? (
+                <Skeleton className="h-12 w-full rounded-lg" />
+              ) : (
+                <div className="flex gap-4 text-sm">
+                  <div className="text-center">
+                    <p className="text-2xl font-bold text-warning">
+                      {mentorPendingTasksCount}
+                    </p>
+                    <p className="text-[11px] text-muted-foreground uppercase tracking-wide">
+                      Pending
+                    </p>
+                  </div>
+                </div>
+              )}
+            </CardContent>
+          </Card>
+        </Link>
         <EventCalendarCard
           events={flattenDashboardCalendar(calendarData)}
           isLoading={loadingCalendar}
diff --git a/src/features/home/components/mentor/upcoming-sessions-card.tsx b/src/features/home/components/mentor/upcoming-sessions-card.tsx
index bb388e60..83cf0e0d 100644
--- a/src/features/home/components/mentor/upcoming-sessions-card.tsx
+++ b/src/features/home/components/mentor/upcoming-sessions-card.tsx
@@ -1,4 +1,5 @@
 import { CalendarClock } from "lucide-react";
+import Link from "next/link";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 import { cn } from "@/lib/utils";
@@ -78,9 +79,10 @@ export function UpcomingSessionsCard({ sessions, isLoading }: Props) {
               const color = avatarColor(session.id);
               const status = session.status;
               return (
-                <div
+                <Link
+                  href={`/dashboard/mentor/sessions?session=${session.id}`}
                   key={session.id}
-                  className="flex items-center gap-3 border-b border-border py-3 last:border-b-0"
+                  className="flex items-center gap-3 border-b border-border py-3 px-2 -mx-2 rounded-xl transition-colors hover:bg-muted/50 last:border-b-0"
                 >
                   <div
                     className="flex size-9 shrink-0 items-center justify-center rounded-full text-xs font-bold text-primary-foreground"
@@ -111,7 +113,7 @@ export function UpcomingSessionsCard({ sessions, isLoading }: Props) {
                   >
                     {status.charAt(0) + status.slice(1).toLowerCase()}
                   </span>
-                </div>
+                </Link>
               );
             })}
           </div>
diff --git a/src/features/mentor/mentees/components/mentees-page.tsx b/src/features/mentor/mentees/components/mentees-page.tsx
index 0180b46f..ca350998 100644
--- a/src/features/mentor/mentees/components/mentees-page.tsx
+++ b/src/features/mentor/mentees/components/mentees-page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { LogIn, MessageSquarePlus, Search } from "lucide-react";
+import { MessageSquarePlus, Search } from "lucide-react";
 import { useState } from "react";
 import { Avatar, AvatarFallback } from "@/components/ui/avatar";
 import { Badge } from "@/components/ui/badge";
@@ -17,7 +17,6 @@ import {
 } from "@/components/ui/table";
 import { useMentees } from "../hooks/use-mentees";
 
-import { JoinSessionDialog } from "./join-session-dialog";
 import { ParticipantHistorySheet } from "./participant-history-sheet";
 import { SessionFeedbackDialog } from "./session-feedback-dialog";
 
@@ -57,11 +56,6 @@ export function MenteesPage({ title = "Mentees" }: { title?: string } = {}) {
     sessionTitle: string;
   }>({ open: false, sessionId: "", sessionTitle: "" });
 
-  const [joinDialog, setJoinDialog] = useState<{
-    open: boolean;
-    sessionId: string;
-  }>({ open: false, sessionId: "" });
-
   const { data, isLoading } = useMentees();
 
   // Client-side search filter on name or mu_id
@@ -95,15 +89,6 @@ export function MenteesPage({ title = "Mentees" }: { title?: string } = {}) {
               </p>
             )}
           </div>
-          {/* Mobile Join Session Button */}
-          <Button
-            variant="outline"
-            className="md:hidden"
-            onClick={() => setJoinDialog({ open: true, sessionId: "" })}
-          >
-            <LogIn className="mr-2 h-4 w-4" />
-            Join Session
-          </Button>
         </div>
 
         <div className="flex items-center gap-2">
@@ -116,15 +101,6 @@ export function MenteesPage({ title = "Mentees" }: { title?: string } = {}) {
               onChange={(e) => setSearch(e.target.value)}
             />
           </div>
-          {/* Desktop Join Session Button */}
-          <Button
-            variant="outline"
-            className="hidden md:flex"
-            onClick={() => setJoinDialog({ open: true, sessionId: "" })}
-          >
-            <LogIn className="mr-2 h-4 w-4" />
-            Join Session
-          </Button>
         </div>
       </div>
 
@@ -229,12 +205,6 @@ export function MenteesPage({ title = "Mentees" }: { title?: string } = {}) {
         sessionId={feedbackDialog.sessionId}
         sessionTitle={feedbackDialog.sessionTitle}
       />
-
-      <JoinSessionDialog
-        open={joinDialog.open}
-        onOpenChange={(open) => setJoinDialog((prev) => ({ ...prev, open }))}
-        defaultSessionId={joinDialog.sessionId}
-      />
     </div>
   );
 }
diff --git a/src/features/mentor/onboarding/api/onboarding.api.ts b/src/features/mentor/onboarding/api/onboarding.api.ts
index 229ed910..5e66ecc5 100644
--- a/src/features/mentor/onboarding/api/onboarding.api.ts
+++ b/src/features/mentor/onboarding/api/onboarding.api.ts
@@ -3,6 +3,7 @@ import { endpoints } from "@/api/endpoints";
 import type { MentorProfileWrite } from "../schemas";
 import {
   type MentorApplication,
+  MentorApplicationMutationResponseSchema,
   MentorApplicationResponseSchema,
   type MentorStatusData,
   MentorStatusResponseSchema,
@@ -14,7 +15,12 @@ export async function getMentorApplicationStatus(): Promise<MentorStatusData> {
   const res = await apiClient.get(
     endpoints.mentor.status,
     MentorStatusResponseSchema,
-    { skipAuthRedirectOn403: true },
+    {
+      skipAuthRedirectOn403: true,
+      // The backend represents an absent application as 400. The onboarding
+      // hook intentionally maps that response to the "not applied" state.
+      expectedErrorStatuses: [400],
+    },
   );
   return res.response;
 }
@@ -23,28 +29,26 @@ export async function getMentorApplicationStatus(): Promise<MentorStatusData> {
 // Submit a new mentor application.
 export async function submitMentorApplication(
   data: MentorProfileWrite,
-): Promise<MentorApplication> {
-  const res = await apiClient.post(
+): Promise<void> {
+  await apiClient.post(
     endpoints.mentor.register,
     data,
-    MentorApplicationResponseSchema,
+    MentorApplicationMutationResponseSchema,
     { skipAuthRedirectOn403: true },
   );
-  return res.response;
 }
 
 // ─── PATCH /register/ ─────────────────────────────────────────────────────────
 // Update a PENDING or REJECTED application (re-submits rejected ones as PENDING).
 export async function updateMentorApplication(
   data: Partial<MentorProfileWrite>,
-): Promise<MentorApplication> {
-  const res = await apiClient.patch(
+): Promise<void> {
+  await apiClient.patch(
     endpoints.mentor.register,
     data,
-    MentorApplicationResponseSchema,
+    MentorApplicationMutationResponseSchema,
     { skipAuthRedirectOn403: true },
   );
-  return res.response;
 }
 
 // ─── GET /profile/ ────────────────────────────────────────────────────────────
@@ -71,3 +75,17 @@ export async function updateMentorProfile(
   );
   return res.response;
 }
+
+// ── POST /change-company/ ─────────────────────────────────────────────────────
+// Submit a company affiliation change request (pending admin approval).
+export async function requestMentorCompanyChange(payload: {
+  company_id: string;
+  reason: string;
+}): Promise<void> {
+  await apiClient.post(
+    endpoints.mentor.changeCompany,
+    payload,
+    MentorApplicationMutationResponseSchema,
+    { skipAuthRedirectOn403: true },
+  );
+}
diff --git a/src/features/mentor/onboarding/components/mentor-onboarding-form.tsx b/src/features/mentor/onboarding/components/mentor-onboarding-form.tsx
index 6cdf05f9..2e1ed025 100644
--- a/src/features/mentor/onboarding/components/mentor-onboarding-form.tsx
+++ b/src/features/mentor/onboarding/components/mentor-onboarding-form.tsx
@@ -1,8 +1,9 @@
 "use client";
 
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
+import { z } from "zod";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
@@ -21,9 +22,18 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { MultiSelect } from "@/components/ui/multi-select";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { TagInput } from "@/components/ui/tag-input";
 import { Textarea } from "@/components/ui/textarea";
 import { useInterestGroupsList } from "@/features/home/hooks";
+import { useCompanies } from "@/features/onboarding/hooks";
 import { useOnboardingDraftStore } from "../hooks/use-draft-store";
 import {
   useSubmitMentorApplication,
@@ -32,18 +42,137 @@ import {
 import type { MentorApplication } from "../schemas";
 import { OnboardingFormSchema, type OnboardingFormValues } from "../schemas";
 
+// ── Per-tab Zod schemas ───────────────────────────────────────────────────────
+const IgFormSchema = OnboardingFormSchema;
+
+// Company Mentor: `org` is required (it's the company/organisation UUID)
+const CompanyFormSchema = OnboardingFormSchema.extend({
+  org: z.string().min(1, "Please select a Company Affiliation"),
+});
+
+type MentorType = "ig" | "company";
+
 interface MentorOnboardingFormProps {
   existing?: MentorApplication;
   isEdit?: boolean;
   isReapply?: boolean;
 }
 
+// ── SharedFields ──────────────────────────────────────────────────────────────
+// Defined at MODULE SCOPE (not inside MentorOnboardingForm).
+// Keeping it outside prevents React from seeing a new component reference on
+// every parent render, which would unmount/remount the inputs and lose focus.
+function SharedFields({
+  form,
+  igOptions,
+}: {
+  form: ReturnType<typeof useForm<OnboardingFormValues>>;
+  igOptions: { value: string; label: string }[];
+}) {
+  return (
+    <>
+      <FormField
+        control={form.control}
+        name="about"
+        render={({ field }) => (
+          <FormItem>
+            <FormLabel>About You</FormLabel>
+            <FormControl>
+              <Textarea
+                placeholder="Describe your background and experience (min 50 characters)..."
+                rows={4}
+                {...field}
+              />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+
+      <FormField
+        control={form.control}
+        name="expertise"
+        render={({ field }) => (
+          <FormItem>
+            <FormLabel>
+              Expertise{" "}
+              <span className="text-muted-foreground font-normal">
+                (at least 3, e.g. React, Python, Machine Learning)
+              </span>
+            </FormLabel>
+            <FormControl>
+              <TagInput
+                value={field.value ?? []}
+                onChange={field.onChange}
+                placeholder="Type a skill and press Enter…"
+              />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+
+      <FormField
+        control={form.control}
+        name="reason"
+        render={({ field }) => (
+          <FormItem>
+            <FormLabel>Why do you want to mentor?</FormLabel>
+            <FormControl>
+              <Textarea
+                placeholder="Share your motivation (min 30 characters)..."
+                rows={3}
+                {...field}
+              />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+
+      <FormField
+        control={form.control}
+        name="preferred_ig_ids"
+        render={({ field }) => (
+          <FormItem>
+            <FormLabel>Preferred Interest Groups</FormLabel>
+            <FormControl>
+              <MultiSelect
+                options={igOptions}
+                value={field.value}
+                onChange={field.onChange}
+                placeholder="Select IGs you want to mentor in..."
+                maxSelections={5}
+              />
+            </FormControl>
+            {field.value.length > 0 && (
+              <div className="flex flex-wrap gap-1 mt-1">
+                {igOptions
+                  .filter((o) => field.value.includes(o.value))
+                  .map((o) => (
+                    <Badge key={o.value} variant="outline" className="text-xs">
+                      {o.label}
+                    </Badge>
+                  ))}
+              </div>
+            )}
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+    </>
+  );
+}
+
+// ── Main form component ───────────────────────────────────────────────────────
 export function MentorOnboardingForm({
   existing,
   isEdit = false,
   isReapply = false,
 }: MentorOnboardingFormProps) {
   const { data: igList = [] } = useInterestGroupsList();
+  const { data: companiesList = [] } = useCompanies();
+
   const { mutate: submit, isPending: isSubmitting } =
     useSubmitMentorApplication();
   const { mutate: update, isPending: isUpdating } =
@@ -51,9 +180,10 @@ export function MentorOnboardingForm({
 
   const isPending = isSubmitting || isUpdating;
 
-  const defaultValues: OnboardingFormValues = {
+  const [mentorType, setMentorType] = useState<MentorType>("ig");
+
+  const baseDefaults: OnboardingFormValues = {
     about: existing?.about ?? "",
-    // Expertise is stored as a comma string on the backend; split into chips.
     expertise:
       typeof existing?.expertise === "string"
         ? existing.expertise
@@ -65,30 +195,52 @@ export function MentorOnboardingForm({
           : [],
     reason: existing?.reason ?? "",
     preferred_ig_ids: existing?.preferred_ig_ids ?? [],
+    org: undefined,
   };
 
   const { draft, setDraft, clearDraft } = useOnboardingDraftStore();
 
-  const form = useForm<OnboardingFormValues>({
-    resolver: zodResolver(OnboardingFormSchema),
-    defaultValues: draft ? { ...defaultValues, ...draft } : defaultValues,
+  // ── IG Mentor form ────────────────────────────────────────────────────────
+  const igForm = useForm<OnboardingFormValues>({
+    resolver: zodResolver(IgFormSchema),
+    defaultValues: draft
+      ? { ...baseDefaults, ...draft, org: undefined }
+      : baseDefaults,
   });
 
+  // ── Company Mentor form ───────────────────────────────────────────────────
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const companyForm = useForm<OnboardingFormValues>({
+    resolver: zodResolver(CompanyFormSchema) as any, // superset schema; cast is safe
+    defaultValues: draft ? { ...baseDefaults, ...draft } : baseDefaults,
+  });
+
+  // Persist draft from whichever tab is active
+  useEffect(() => {
+    const sub = igForm.watch((value) => {
+      if (mentorType === "ig") setDraft(value as Partial<OnboardingFormValues>);
+    });
+    return () => sub.unsubscribe();
+  }, [igForm, mentorType, setDraft]);
+
   useEffect(() => {
-    const subscription = form.watch((value) => {
-      setDraft(value as Partial<OnboardingFormValues>);
+    const sub = companyForm.watch((value) => {
+      if (mentorType === "company")
+        setDraft(value as Partial<OnboardingFormValues>);
     });
-    return () => subscription.unsubscribe();
-  }, [form, setDraft]);
+    return () => sub.unsubscribe();
+  }, [companyForm, mentorType, setDraft]);
 
   const igOptions = igList.map((ig) => ({ value: ig.id, label: ig.name }));
 
-  function onSubmit(values: OnboardingFormValues) {
-    // Join expertise chips into the comma string the backend stores.
-    const payload = {
-      ...values,
-      expertise: (values.expertise ?? []).join(", "),
-    };
+  function buildPayload(values: OnboardingFormValues) {
+    return { ...values, expertise: (values.expertise ?? []).join(", ") };
+  }
+
+  function onSubmitIg(values: OnboardingFormValues) {
+    const payload = buildPayload(values);
+    // Strip `org` — IG Mentor submissions must not include it
+    delete (payload as Record<string, unknown>).org;
     if (isEdit) {
       update(payload, { onSuccess: clearDraft });
     } else {
@@ -96,129 +248,118 @@ export function MentorOnboardingForm({
     }
   }
 
+  function onSubmitCompany(values: OnboardingFormValues) {
+    const payload = buildPayload(values);
+    // `org` is the company UUID; validated non-empty by CompanyFormSchema
+    if (isEdit) {
+      update(payload, { onSuccess: clearDraft });
+    } else {
+      submit(payload, { onSuccess: clearDraft });
+    }
+  }
+
+  const cardTitle = isReapply
+    ? "Reapply as Mentor"
+    : isEdit
+      ? "Update Your Application"
+      : "Apply to Become a Mentor";
+
+  const cardDesc = isReapply
+    ? "Update your application details and resubmit for admin review."
+    : "Tell us about your expertise and why you want to mentor learners.";
+
+  const submitLabel = isPending
+    ? "Submitting..."
+    : isReapply
+      ? "Resubmit Application"
+      : isEdit
+        ? "Update Application"
+        : "Submit Application";
+
   return (
     <Card className="max-w-2xl mx-auto">
       <CardHeader>
-        <CardTitle>
-          {isReapply
-            ? "Reapply as Mentor"
-            : isEdit
-              ? "Update Your Application"
-              : "Apply to Become a Mentor"}
-        </CardTitle>
-        <CardDescription>
-          {isReapply
-            ? "Update your application details and resubmit for admin review."
-            : "Tell us about your expertise and why you want to mentor learners."}
-        </CardDescription>
+        <CardTitle>{cardTitle}</CardTitle>
+        <CardDescription>{cardDesc}</CardDescription>
       </CardHeader>
       <CardContent>
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
-            <FormField
-              control={form.control}
-              name="about"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>About You</FormLabel>
-                  <FormControl>
-                    <Textarea
-                      placeholder="Describe your background and experience (min 50 characters)..."
-                      rows={4}
-                      {...field}
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <FormField
-              control={form.control}
-              name="expertise"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>
-                    Expertise{" "}
-                    <span className="text-muted-foreground font-normal">
-                      (at least 3, e.g. React, Python, Machine Learning)
-                    </span>
-                  </FormLabel>
-                  <FormControl>
-                    <TagInput
-                      value={field.value ?? []}
-                      onChange={field.onChange}
-                      placeholder="Type a skill and press Enter…"
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <FormField
-              control={form.control}
-              name="reason"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Why do you want to mentor?</FormLabel>
-                  <FormControl>
-                    <Textarea
-                      placeholder="Share your motivation (min 30 characters)..."
-                      rows={3}
-                      {...field}
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <FormField
-              control={form.control}
-              name="preferred_ig_ids"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Preferred Interest Groups</FormLabel>
-                  <FormControl>
-                    <MultiSelect
-                      options={igOptions}
-                      value={field.value}
-                      onChange={field.onChange}
-                      placeholder="Select IGs you want to mentor in..."
-                    />
-                  </FormControl>
-                  {field.value.length > 0 && (
-                    <div className="flex flex-wrap gap-1 mt-1">
-                      {igOptions
-                        .filter((o) => field.value.includes(o.value))
-                        .map((o) => (
-                          <Badge
-                            key={o.value}
-                            variant="outline"
-                            className="text-xs"
-                          >
-                            {o.label}
-                          </Badge>
-                        ))}
-                    </div>
+        <Tabs
+          value={mentorType}
+          onValueChange={(v) => setMentorType(v as MentorType)}
+          className="w-full"
+        >
+          <TabsList className="w-full mb-6">
+            <TabsTrigger value="ig" className="flex-1">
+              IG Mentor
+            </TabsTrigger>
+            <TabsTrigger value="company" className="flex-1">
+              Company Mentor
+            </TabsTrigger>
+          </TabsList>
+
+          {/* ── IG Mentor Tab ──────────────────────────────────────────── */}
+          <TabsContent value="ig">
+            <Form {...igForm}>
+              <form
+                onSubmit={igForm.handleSubmit(onSubmitIg)}
+                className="space-y-6"
+              >
+                <SharedFields form={igForm} igOptions={igOptions} />
+                <Button type="submit" disabled={isPending} className="w-full">
+                  {submitLabel}
+                </Button>
+              </form>
+            </Form>
+          </TabsContent>
+
+          {/* ── Company Mentor Tab ─────────────────────────────────────── */}
+          <TabsContent value="company">
+            <Form {...companyForm}>
+              <form
+                onSubmit={companyForm.handleSubmit(onSubmitCompany)}
+                className="space-y-6"
+              >
+                <SharedFields form={companyForm} igOptions={igOptions} />
+
+                {/* Company Affiliation — maps to the `org` field in the API */}
+                <FormField
+                  control={companyForm.control}
+                  name="org"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Company Affiliation</FormLabel>
+                      <Select
+                        value={field.value ?? ""}
+                        onValueChange={field.onChange}
+                      >
+                        <FormControl>
+                          <SelectTrigger className="w-full">
+                            <SelectValue placeholder="Select your company…" />
+                          </SelectTrigger>
+                        </FormControl>
+                        <SelectContent
+                          position="popper"
+                          className="max-h-[300px]"
+                        >
+                          {companiesList.map((c) => (
+                            <SelectItem key={c.id} value={c.id}>
+                              {c.title}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                      <FormMessage />
+                    </FormItem>
                   )}
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <Button type="submit" disabled={isPending} className="w-full">
-              {isPending
-                ? "Submitting..."
-                : isReapply
-                  ? "Resubmit Application"
-                  : isEdit
-                    ? "Update Application"
-                    : "Submit Application"}
-            </Button>
-          </form>
-        </Form>
+                />
+
+                <Button type="submit" disabled={isPending} className="w-full">
+                  {submitLabel}
+                </Button>
+              </form>
+            </Form>
+          </TabsContent>
+        </Tabs>
       </CardContent>
     </Card>
   );
diff --git a/src/features/mentor/onboarding/hooks/use-onboarding.ts b/src/features/mentor/onboarding/hooks/use-onboarding.ts
index f5195c91..d71d0a27 100644
--- a/src/features/mentor/onboarding/hooks/use-onboarding.ts
+++ b/src/features/mentor/onboarding/hooks/use-onboarding.ts
@@ -8,6 +8,7 @@ import { getApiResponseError } from "@/hooks/use-get-error";
 import {
   getMentorApplicationStatus,
   getMentorProfile,
+  requestMentorCompanyChange,
   submitMentorApplication,
   updateMentorApplication,
   updateMentorProfile,
@@ -134,5 +135,23 @@ export function useUpdateMentorProfile() {
   });
 }
 
+// ─── POST /change-company/ ───────────────────────────────────────────────────
+export function useRequestMentorCompanyChange() {
+  return useMutation({
+    mutationFn: (payload: { company_id: string; reason: string }) =>
+      requestMentorCompanyChange(payload),
+    onSuccess: () =>
+      toast.success(
+        "Company change request submitted. Pending admin approval.",
+      ),
+    onError: (error) =>
+      toast.error(
+        getApiResponseError(error, {
+          fallback: "Failed to submit company change request",
+        }),
+      ),
+  });
+}
+
 // ─── Backward compat alias ────────────────────────────────────────────────────
 export const useMentorApplication = useMentorApplicationStatus;
diff --git a/src/features/mentor/onboarding/schemas/index.test.ts b/src/features/mentor/onboarding/schemas/index.test.ts
new file mode 100644
index 00000000..ca625287
--- /dev/null
+++ b/src/features/mentor/onboarding/schemas/index.test.ts
@@ -0,0 +1,31 @@
+import { describe, expect, it } from "vitest";
+import {
+  MentorApplicationMutationResponseSchema,
+  MentorApplicationResponseSchema,
+} from "./index";
+
+const responseEnvelope = {
+  hasError: false,
+  statusCode: 200,
+  message: { general: ["Mentor application updated successfully."] },
+};
+
+describe("mentor onboarding response schemas", () => {
+  it("accepts the register mutation acknowledgement", () => {
+    const result = MentorApplicationMutationResponseSchema.safeParse({
+      ...responseEnvelope,
+      response: { message: "Application updated" },
+    });
+
+    expect(result.success).toBe(true);
+  });
+
+  it("continues to require a full mentor profile for profile reads", () => {
+    const result = MentorApplicationResponseSchema.safeParse({
+      ...responseEnvelope,
+      response: { message: "Application updated" },
+    });
+
+    expect(result.success).toBe(false);
+  });
+});
diff --git a/src/features/mentor/onboarding/schemas/index.ts b/src/features/mentor/onboarding/schemas/index.ts
index 5c184adb..a1dcd5f1 100644
--- a/src/features/mentor/onboarding/schemas/index.ts
+++ b/src/features/mentor/onboarding/schemas/index.ts
@@ -20,6 +20,7 @@ export const MentorApplicationSchema = z.object({
   preferred_ig_ids: z.array(z.string()).optional().default([]),
   org: z.string().nullable().optional(),
   company: z.string().nullable().optional(),
+  linkedin: z.string().nullable().optional(),
   verified_by: z.string().nullable().optional(),
   verified_at: z.string().nullable().optional(),
   verification_note: z.string().nullable().optional(),
@@ -60,6 +61,7 @@ function normaliseMentorStatus(raw: unknown): MentorStatusData {
       mentor_id: typeof obj.mentor_id === "string" ? obj.mentor_id : null,
       organization:
         typeof obj.organization === "string" ? obj.organization : null,
+      mentor_tier: typeof obj.mentor_tier === "string" ? obj.mentor_tier : null,
     };
   }
 
@@ -70,6 +72,7 @@ function normaliseMentorStatus(raw: unknown): MentorStatusData {
     rejection_reason: null,
     mentor_id: null,
     organization: null,
+    mentor_tier: null,
   };
 }
 
@@ -85,13 +88,22 @@ export type MentorStatusData = {
   // `GET /mentor/status/` response previously read via a separate `useMentorStatus`
   // hook; consolidated onto this canonical hook/key.
   organization?: string | null;
+  mentor_tier?: string | null;
 };
 
-// ─── GET/PATCH /profile/ and POST/PATCH /register/ response wrapper ───────────
+// ─── GET/PATCH /profile/ response wrapper ────────────────────────────────────
 export const MentorApplicationResponseSchema = ApiResponseSchema(
   MentorApplicationSchema,
 );
 
+// ─── POST/PATCH /register/ response wrapper ─────────────────────────────────
+// Registration mutations return a success acknowledgement, not a mentor profile.
+// Keep the envelope validation while allowing the backend's acknowledgement body
+// to evolve independently from the profile representation.
+export const MentorApplicationMutationResponseSchema = ApiResponseSchema(
+  z.unknown(),
+);
+
 // ─── Form values for POST/PATCH /register/ ───────────────────────────────────
 // `expertise` is collected as chips (an array) in the UI; it is joined to a
 // comma-separated string at the API boundary (see MentorProfileWrite).
@@ -105,6 +117,10 @@ export const OnboardingFormSchema = z.object({
   preferred_ig_ids: z
     .array(z.string())
     .min(1, "Select at least one Interest Group"),
+  // Optional — only supplied when submitting as a Company Mentor.
+  // The backend field name is `org` (organisation/company UUID).
+  // Omitted (or undefined) for IG Mentor submissions.
+  org: z.string().optional(),
 });
 export type OnboardingFormValues = z.infer<typeof OnboardingFormSchema>;
 
@@ -114,6 +130,10 @@ export type OnboardingFormValues = z.infer<typeof OnboardingFormSchema>;
 // Keeping it tied to OnboardingFormValues avoids drift between form and wire.
 export type MentorProfileWrite = Omit<OnboardingFormValues, "expertise"> & {
   expertise: string;
+  linkedin?: string;
+  // Forwarded as-is to POST/PATCH /register/ for Company Mentor applications.
+  // Backend field name is `org` (organisation UUID).
+  org?: string;
 };
 
 // ─── UI state derived from status ─────────────────────────────────────────────
diff --git a/src/features/mentor/profile/components/mentor-edit-profile-modal.tsx b/src/features/mentor/profile/components/mentor-edit-profile-modal.tsx
index c554c95d..508806aa 100644
--- a/src/features/mentor/profile/components/mentor-edit-profile-modal.tsx
+++ b/src/features/mentor/profile/components/mentor-edit-profile-modal.tsx
@@ -11,7 +11,7 @@
 "use client";
 
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Loader2, X } from "lucide-react";
+import { ExternalLink, Loader2, X } from "lucide-react";
 import Image from "next/image";
 import { useEffect, useRef, useState } from "react";
 import { type Resolver, useForm } from "react-hook-form";
@@ -37,17 +37,23 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { MultiSelect } from "@/components/ui/multi-select";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+
 import { TagInput } from "@/components/ui/tag-input";
 import { Textarea } from "@/components/ui/textarea";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
+
 import { useInterestGroupsList } from "@/features/home/hooks";
-import { useMentorOverview } from "@/features/mentor/hooks";
-import { useUpdateMentorProfile } from "@/features/mentor/onboarding/hooks/use-onboarding";
+import { useCompanies } from "@/features/onboarding/hooks";
+import {
+  useRequestMentorCompanyChange,
+  useUpdateMentorProfile,
+} from "@/features/mentor/onboarding/hooks/use-onboarding";
 import type {
   MentorApplication,
   MentorProfileWrite,
@@ -73,6 +79,12 @@ const MentorEditSchema = z.object({
     .array(z.string())
     .min(1, "You must mentor at least one Interest Group"),
   org: z.string().optional(),
+  // Union tries "" first so an empty field never triggers the url() validator.
+  // The previous .optional().or(z.literal("")) order ran url() on "" and failed,
+  // silently aborting the entire form submission.
+  linkedin: z
+    .union([z.literal(""), z.string().url("Please enter a valid URL")])
+    .optional(),
   profile_pic: z.instanceof(File).optional(),
 });
 
@@ -96,14 +108,19 @@ export function MentorEditProfileModal({
   const fileInputRef = useRef<HTMLInputElement>(null);
   const [previewUrl, setPreviewUrl] = useState<string | null>(null);
 
+  const [selectedCompanyId, setSelectedCompanyId] = useState("");
+  const [changeReason, setChangeReason] = useState("");
+
   const updateProfileMutation = useUpdateProfile();
   const updateProfileImageMutation = useUpdateProfileImage();
   const updateMentorProfileMutation = useUpdateMentorProfile();
+  const companyChangeMutation = useRequestMentorCompanyChange();
 
   const isPending =
     updateProfileMutation.isPending ||
     updateProfileImageMutation.isPending ||
-    updateMentorProfileMutation.isPending;
+    updateMentorProfileMutation.isPending ||
+    companyChangeMutation.isPending;
 
   const { data: igList = [] } = useInterestGroupsList();
   const igOptions = igList.map((ig) => ({ value: ig.id, label: ig.name }));
@@ -121,6 +138,7 @@ export function MentorEditProfileModal({
         : [],
       preferred_ig_ids: mentorProfile.preferred_ig_ids ?? [],
       org: mentorProfile.org ?? "",
+      linkedin: mentorProfile.linkedin ?? "",
       profile_pic: undefined,
     },
   });
@@ -139,9 +157,13 @@ export function MentorEditProfileModal({
           : [],
         preferred_ig_ids: mentorProfile.preferred_ig_ids ?? [],
         org: mentorProfile.org ?? "",
+        linkedin: mentorProfile.linkedin ?? "",
         profile_pic: undefined,
       });
       setPreviewUrl(null);
+      // Reset company-change form on each open
+      setSelectedCompanyId("");
+      setChangeReason("");
     }
   }, [
     open,
@@ -150,6 +172,7 @@ export function MentorEditProfileModal({
     mentorProfile.expertise,
     mentorProfile.preferred_ig_ids,
     mentorProfile.org,
+    mentorProfile.linkedin,
     form,
   ]);
 
@@ -169,14 +192,18 @@ export function MentorEditProfileModal({
     setPreviewUrl(url);
   };
 
-  // Resolve the org's display name (the profile only carries the org UUID).
-  const { data: overview } = useMentorOverview();
-  const orgName = overview?.scopes?.find(
-    (s) =>
-      s.scope_type === "COMPANY_MENTOR" || s.scope_type === "CAMPUS_MENTOR",
-  )?.scope_name;
+  // Companies list for the change-company select
+  const { data: companiesList = [] } = useCompanies();
 
   const handleSubmit = async (values: MentorEditValues) => {
+    // Validate company change before attempting any other mutations
+    if (selectedCompanyId && changeReason.trim().length < 10) {
+      toast.error(
+        "Please provide a reason (at least 10 characters) for the company change.",
+      );
+      return;
+    }
+
     // IG selection is open to every tier (org and IG scopes coexist). The
     // backend enforces "keep at least one scope" — surfaced via the mutation's
     // error toast — so no tier-specific block is needed here.
@@ -196,12 +223,20 @@ export function MentorEditProfileModal({
       const isIgsChanged =
         JSON.stringify(values.preferred_ig_ids ?? []) !==
         JSON.stringify(mentorProfile.preferred_ig_ids ?? []);
+      const isLinkedinChanged =
+        values.linkedin !== (mentorProfile.linkedin ?? "");
 
-      if (isAboutChanged || isExpertiseChanged || isIgsChanged) {
+      if (
+        isAboutChanged ||
+        isExpertiseChanged ||
+        isIgsChanged ||
+        isLinkedinChanged
+      ) {
         const payload: Partial<MentorProfileWrite> = {};
         if (isAboutChanged) payload.about = values.about ?? "";
         if (isExpertiseChanged) payload.expertise = newExpertise;
         if (isIgsChanged) payload.preferred_ig_ids = values.preferred_ig_ids;
+        if (isLinkedinChanged) payload.linkedin = values.linkedin;
 
         await updateMentorProfileMutation.mutateAsync(payload);
       }
@@ -214,6 +249,14 @@ export function MentorEditProfileModal({
         });
       }
 
+      // 4. Submit company change request if selected
+      if (selectedCompanyId) {
+        await companyChangeMutation.mutateAsync({
+          company_id: selectedCompanyId,
+          reason: changeReason.trim(),
+        });
+      }
+
       onOpenChange(false);
     } catch {
       // Individual mutation hooks surface their own toasts
@@ -366,35 +409,108 @@ export function MentorEditProfileModal({
                       shouldDirty: true,
                     })
                   }
-                  placeholder="Select IGs you want to mentor in..."
+                  placeholder={
+                    mentorProfile.preferred_ig_ids &&
+                    mentorProfile.preferred_ig_ids.length > 0
+                      ? `Current: ${mentorProfile.preferred_ig_ids
+                          .map((id) => igList.find((g) => g.id === id)?.name)
+                          .filter(Boolean)
+                          .join(", ")}`
+                      : "Select IGs you want to mentor in..."
+                  }
+                  maxSelections={5}
                 />
                 <p className="text-[0.8rem] text-muted-foreground">
                   Changes to your Interest Groups apply immediately.
                 </p>
               </div>
 
+              {/* LinkedIn */}
+              <FormField
+                control={form.control}
+                name="linkedin"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>LinkedIn Profile</FormLabel>
+                    <FormControl>
+                      <Input
+                        placeholder={
+                          mentorProfile.linkedin
+                            ? `Current: ${mentorProfile.linkedin} ↗`
+                            : "https://linkedin.com/in/your-profile"
+                        }
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormDescription className="text-xs">
+                      Changing your LinkedIn URL submits it for admin
+                      verification. Your current URL stays live until approved.
+                    </FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
               {/* Affiliation */}
               <div className="space-y-2">
-                <div className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
-                  Company / Campus Affiliation
+                <div className="text-sm font-medium leading-none">
+                  Company Affiliation
                 </div>
-                <TooltipProvider>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <div>
-                        <Input
-                          value={orgName ?? form.watch("org") ?? ""}
-                          placeholder="Affiliation"
-                          disabled
-                          className="cursor-not-allowed"
+
+                {/* Inline change form — only shown/required when a new company is selected */}
+                <div className="space-y-3 pt-1">
+                  {/* Company select */}
+                  <div className="space-y-1">
+                    <Select
+                      value={selectedCompanyId}
+                      onValueChange={(val) => setSelectedCompanyId(val)}
+                    >
+                      <SelectTrigger id="company-select" className="w-full">
+                        <SelectValue
+                          placeholder={
+                            mentorProfile.company
+                              ? `Current: ${mentorProfile.company}`
+                              : "Select a new company…"
+                          }
                         />
-                      </div>
-                    </TooltipTrigger>
-                    <TooltipContent>
-                      <p>Affiliation editing coming soon.</p>
-                    </TooltipContent>
-                  </Tooltip>
-                </TooltipProvider>
+                      </SelectTrigger>
+                      <SelectContent
+                        position="popper"
+                        className="max-h-[300px]"
+                      >
+                        {companiesList.map((c) => (
+                          <SelectItem key={c.id} value={c.id}>
+                            {c.title}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </div>
+
+                  {/* Reason textarea — only required when a company is selected */}
+                  {selectedCompanyId && (
+                    <div className="space-y-1">
+                      <label
+                        htmlFor="company-reason"
+                        className="text-xs font-medium text-foreground"
+                      >
+                        Reason <span className="text-destructive">*</span>
+                      </label>
+                      <Textarea
+                        id="company-reason"
+                        placeholder="Why are you changing your company affiliation?"
+                        rows={3}
+                        className="resize-none text-sm"
+                        value={changeReason}
+                        onChange={(e) => setChangeReason(e.target.value)}
+                      />
+                      <p className="text-[0.8rem] text-muted-foreground">
+                        Company change requests require admin approval. Your
+                        current affiliation stays live until approved.
+                      </p>
+                    </div>
+                  )}
+                </div>
               </div>
 
               {/* Read-only: Tier */}
diff --git a/src/features/mentor/profile/components/tabs/availability-tab.tsx b/src/features/mentor/profile/components/tabs/availability-tab.tsx
index 841b61fb..d530b0c4 100644
--- a/src/features/mentor/profile/components/tabs/availability-tab.tsx
+++ b/src/features/mentor/profile/components/tabs/availability-tab.tsx
@@ -61,7 +61,7 @@ export function AvailabilityTab() {
             ))}
           </div>
         ) : !schedule || schedule.length === 0 ? (
-          <div className="flex min-h-[100px] flex-col items-center justify-center gap-2 rounded-xl border border-dashed text-muted-foreground">
+          <div className="flex min-h-[100px] flex-col items-center justify-center gap-2 rounded-xl border-2 border-dashed border-muted-foreground/30 bg-muted/10 p-6 text-muted-foreground">
             <Clock className="h-8 w-8 opacity-30" />
             <p className="text-sm">No availability set.</p>
             <Button asChild size="sm" variant="outline">
diff --git a/src/features/mentor/task-requests/components/task-requests-page.tsx b/src/features/mentor/task-requests/components/task-requests-page.tsx
index ca300dd8..57726974 100644
--- a/src/features/mentor/task-requests/components/task-requests-page.tsx
+++ b/src/features/mentor/task-requests/components/task-requests-page.tsx
@@ -14,6 +14,7 @@ import {
 } from "lucide-react";
 import { useEffect, useState } from "react";
 import { type Resolver, useForm } from "react-hook-form";
+import { useSearchParams } from "next/navigation";
 import { TaskDetailDialog } from "@/components/task-detail-dialog";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -732,6 +733,15 @@ export function TaskRequestsPage() {
 
   const pendingCount = pendingResult?.data?.length ?? 0;
 
+  const searchParams = useSearchParams();
+  const requestedTab = searchParams.get("tab");
+  const defaultTab =
+    requestedTab === "pending" ||
+    requestedTab === "approved" ||
+    requestedTab === "rejected"
+      ? requestedTab
+      : "all";
+
   return (
     <TooltipProvider delayDuration={200}>
       <div className="space-y-6">
@@ -750,7 +760,7 @@ export function TaskRequestsPage() {
         </div>
 
         {/* Tabs */}
-        <Tabs defaultValue="all">
+        <Tabs defaultValue={defaultTab}>
           <TabsList>
             <TabsTrigger value="all">All Tasks</TabsTrigger>
             <TabsTrigger value="pending">
diff --git a/src/lib/auth/route-access.ts b/src/lib/auth/route-access.ts
index e50a884c..be6f2338 100644
--- a/src/lib/auth/route-access.ts
+++ b/src/lib/auth/route-access.ts
@@ -35,7 +35,11 @@ export const routeAccessMap: Record<string, RouteConfig> = {
   "/dashboard": { roles: [] },
   "/dashboard/profile": { roles: [] },
   "/dashboard/leaderboard": { roles: [] },
-  "/dashboard/learning-circles": { roles: [] },
+  "/dashboard/learning-circle": {
+    roles: [ROLES.ADMIN],
+    dynamicCheck: (roles) =>
+      !roles.some((r) => r === ROLES.MENTOR || r === ROLES.COMPANY),
+  },
   "/dashboard/interest-groups": { roles: [] },
   "/dashboard/campus": { roles: [] },
   "/dashboard/search": { roles: [] },
diff --git a/src/lib/nav-config.ts b/src/lib/nav-config.ts
index cede6016..bdc0036f 100644
--- a/src/lib/nav-config.ts
+++ b/src/lib/nav-config.ts
@@ -134,7 +134,9 @@ export const NAV_ITEMS: readonly NavItem[] = [
     href: "/dashboard/learning-circle",
     icon: BookOpen,
     section: "main",
-    dynamicCheck: (roles) => !roles.some((r) => r === ROLES.COMPANY),
+    dynamicCheck: (roles) =>
+      roles.includes(ROLES.ADMIN) ||
+      !roles.some((r) => r === ROLES.COMPANY || r === ROLES.MENTOR),
   },
   {
     id: "search",
@@ -246,6 +248,7 @@ export const NAV_ITEMS: readonly NavItem[] = [
     icon: Users,
     section: "management",
     roles: [ROLES.MENTOR],
+    dynamicCheck: (_, context) => !!context.isMentorVerified,
   },
   {
     id: "company-jobs",