diff --git a/src/app/_components/admincomponents/admin-dashboard.tsx b/src/app/_components/admincomponents/admin-dashboard.tsx
index 98bd77e4..cd51a405 100644
--- a/src/app/_components/admincomponents/admin-dashboard.tsx
+++ b/src/app/_components/admincomponents/admin-dashboard.tsx
@@ -3,22 +3,29 @@
 import { Box } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { useState } from "react";
+import { InviteAgencyForm } from "@/app/_components/admincomponents/invite-agency-form";
 import { InviteUserForm } from "@/app/_components/admincomponents/invite-user-form";
 import Button from "@/app/_components/common/button/Button";
 import Modal from "@/app/_components/common/modal/modal";
+import Home from "@/assets/icons/home";
+import User from "@/assets/icons/user";
 import { notify } from "@/lib/notifications";
 import { api } from "@/trpc/react";
-import { OrganizationRole } from "@/types/types";
+import { OrganizationRole, Role } from "@/types/types";
+import { emailRegex } from "@/types/validation";
+
+type InviteType = "user" | "agency" | null;
 
 export const AdminDashboard = () => {
   const [showInviteModal, setShowInviteModal] = useState<boolean>(false);
+  const [inviteType, setInviteType] = useState<InviteType>(null);
 
   const organizations = api.organization.getAll.useQuery();
 
   const inviteUserMutation = api.organization.inviteUser.useMutation({
     onSuccess: (data) => {
       notify.success(`Invitation sent to ${data.email}`);
-      form.reset();
+      userForm.reset();
       setShowInviteModal(false);
     },
     onError: (error) => {
@@ -26,58 +33,215 @@ export const AdminDashboard = () => {
     },
   });
 
-  const form = useForm({
+  const createAgencyMutation = api.organization.createOrganization.useMutation({
+    onSuccess: (data) => {
+      if (!data) {
+        notify.error("Failed to create agency");
+        return;
+      }
+      notify.success(`Agency "${data.name}" created successfully`);
+      agencyForm.reset();
+      setShowInviteModal(false);
+      void organizations.refetch();
+    },
+    onError: (error) => {
+      notify.error(error.message || "Failed to create agency");
+    },
+  });
+
+  const userForm = useForm({
     mode: "uncontrolled",
     initialValues: {
       email: "",
+      role: Role.DRIVER,
       organizationRole: OrganizationRole.MEMBER,
       organizationId: "",
     },
     validate: {
-      email: (value) => (value.trim().length > 0 ? null : "Email is required"),
-      organizationRole: (value) => (value.trim().length > 0 ? null : "Role is required"),
-      organizationId: (value) => (value.trim().length > 0 ? null : "Organization is required"),
+      email: (value) => {
+        if (value.trim().length === 0) return "Email is required";
+        if (!emailRegex.test(value)) return "Invalid email address";
+        return null;
+      },
+      role: (value) => (value.trim().length > 0 ? null : "Role is required"),
+      organizationId: (value, values) => {
+        if (values.role === Role.AGENCY) {
+          return value.trim().length > 0 ? null : "Organization is required";
+        }
+        return null;
+      },
+    },
+  });
+
+  const agencyForm = useForm({
+    mode: "uncontrolled",
+    initialValues: {
+      name: "",
+      slug: "",
+    },
+    validate: {
+      name: (value) => (value.trim().length > 0 ? null : "Agency name is required"),
+      slug: (value) => {
+        if (value.trim().length === 0) return "Agency slug is required";
+        if (!/^[a-z0-9-]+$/.test(value))
+          return "Slug must only contain lowercase letters, numbers, and hyphens";
+        return null;
+      },
     },
   });
 
-  const handleConfirm = () => {
-    const validation = form.validate();
+  const handleUserConfirm = () => {
+    const validation = userForm.validate();
+
+    if (validation.hasErrors) {
+      notify.error("Please fix the errors in the form before submitting");
+      return;
+    }
+
+    const formValues = userForm.getValues();
+
+    // Determine the organization ID based on application role
+    let organizationId: string;
+    const appRole = formValues.role;
+
+    if (appRole === Role.ADMIN) {
+      const adminsOrg = organizations.data?.find((org) => org.slug === "admins");
+      if (!adminsOrg) {
+        notify.error("Admins organization not found");
+        return;
+      }
+      organizationId = adminsOrg.id;
+    } else if (appRole === Role.DRIVER) {
+      const driversOrg = organizations.data?.find((org) => org.slug === "drivers");
+      if (!driversOrg) {
+        notify.error("Drivers organization not found");
+        return;
+      }
+      organizationId = driversOrg.id;
+    } else {
+      organizationId = formValues.organizationId;
+    }
+
+    const submitData = {
+      email: formValues.email,
+      organizationRole: formValues.organizationRole,
+      role: formValues.role,
+      organizationId,
+    };
+
+    inviteUserMutation.mutate(submitData);
+  };
+
+  const handleAgencyConfirm = () => {
+    const validation = agencyForm.validate();
 
     if (validation.hasErrors) {
       notify.error("Please fix the errors in the form before submitting");
       return;
     }
 
-    // todo: handle case where admin permissions are given within the organization
-    console.log("submit", form.values);
+    const formValues = agencyForm.getValues();
+    createAgencyMutation.mutate(formValues);
+  };
+
+  const handleCloseModal = () => {
+    userForm.clearErrors();
+    agencyForm.clearErrors();
+    setShowInviteModal(false);
+    setInviteType(null);
+  };
 
-    inviteUserMutation.mutate(form.values);
+  const handleInviteTypeSelect = (type: "user" | "agency") => {
+    setInviteType(type);
   };
 
   return (
     <>
-      <Button onClick={() => setShowInviteModal(true)}>Invite New User</Button>
-      <Modal
-        opened={showInviteModal}
-        onClose={() => {
-          form.clearErrors();
-          setShowInviteModal(false);
-        }}
-        onConfirm={() => {
-          handleConfirm();
-        }}
-        title={
-          <Box fw={600} fz="xl">
-            Invite a new user
+      <Button onClick={() => setShowInviteModal(true)}>Send Invitation</Button>
+
+      {/* Invite Type Selection Modal */}
+      {inviteType === null && (
+        <Modal
+          opened={showInviteModal}
+          onClose={handleCloseModal}
+          onConfirm={() => {}}
+          title={
+            <Box fw={600} fz="xl">
+              Send an Invite to the Navigation Centre
+            </Box>
+          }
+          size="lg"
+          showDefaultFooter={false}
+        >
+          <Box
+            style={{
+              display: "flex",
+              flexDirection: "column",
+              gap: "1rem",
+              padding: "1rem 0",
+            }}
+          >
+            <Button
+              onClick={() => handleInviteTypeSelect("user")}
+              height="48px"
+              fontSize="18px"
+              icon={<User width="24" height="24" stroke="white" />}
+            >
+              Invite User
+            </Button>
+            <Button
+              onClick={() => handleInviteTypeSelect("agency")}
+              height="48px"
+              fontSize="18px"
+              icon={<Home width="24" height="24" stroke="white" />}
+            >
+              Create Agency
+            </Button>
           </Box>
-        }
-        size="md"
-        showDefaultFooter
-        confirmText="Send Invitation"
-        loading={inviteUserMutation.isPending}
-      >
-        <InviteUserForm organizations={organizations.data ?? []} form={form} />
-      </Modal>
+        </Modal>
+      )}
+
+      {/* Invite User Form Modal */}
+      {inviteType === "user" && (
+        <Modal
+          opened={showInviteModal}
+          onClose={handleCloseModal}
+          onConfirm={handleUserConfirm}
+          title={
+            <Box fw={600} fz="xl">
+              Invite a User
+            </Box>
+          }
+          size="lg"
+          showDefaultFooter
+          confirmText="Invite to Navigation Centre"
+          cancelText="Cancel Invite"
+          loading={inviteUserMutation.isPending}
+        >
+          <InviteUserForm organizations={organizations.data ?? []} form={userForm} />
+        </Modal>
+      )}
+
+      {/* Create Agency Form Modal */}
+      {inviteType === "agency" && (
+        <Modal
+          opened={showInviteModal}
+          onClose={handleCloseModal}
+          onConfirm={handleAgencyConfirm}
+          title={
+            <Box fw={600} fz="xl">
+              Create an Agency
+            </Box>
+          }
+          size="lg"
+          showDefaultFooter
+          confirmText="Create Agency"
+          cancelText="Cancel"
+          loading={createAgencyMutation.isPending}
+        >
+          <InviteAgencyForm form={agencyForm} />
+        </Modal>
+      )}
     </>
   );
 };
diff --git a/src/app/_components/admincomponents/invite-agency-form.tsx b/src/app/_components/admincomponents/invite-agency-form.tsx
new file mode 100644
index 00000000..db7cc563
--- /dev/null
+++ b/src/app/_components/admincomponents/invite-agency-form.tsx
@@ -0,0 +1,38 @@
+"use client";
+import { Box, Stack, TextInput } from "@mantine/core";
+import type { UseFormReturnType } from "@mantine/form";
+
+interface InviteAgencyForm {
+  name: string;
+  slug: string;
+}
+
+interface InviteAgencyFormProps {
+  form: UseFormReturnType<InviteAgencyForm>;
+}
+
+export const InviteAgencyForm = ({ form }: InviteAgencyFormProps) => {
+  return (
+    <Stack gap="xl">
+      <Stack gap="md">
+        <Box fw={600} fz="lg" c="var(--color-primary)">
+          Agency Information
+        </Box>
+        <TextInput
+          withAsterisk
+          label="Agency Name"
+          placeholder="Enter agency name"
+          key={form.key("name")}
+          {...form.getInputProps("name")}
+        />
+        <TextInput
+          withAsterisk
+          label="Agency Slug (ex: my-org)"
+          placeholder="Enter agency slug"
+          key={form.key("slug")}
+          {...form.getInputProps("slug")}
+        />
+      </Stack>
+    </Stack>
+  );
+};
diff --git a/src/app/_components/admincomponents/invite-user-form.tsx b/src/app/_components/admincomponents/invite-user-form.tsx
index 7615b796..848a616c 100644
--- a/src/app/_components/admincomponents/invite-user-form.tsx
+++ b/src/app/_components/admincomponents/invite-user-form.tsx
@@ -1,12 +1,15 @@
 "use client";
-import { Box, Divider, Select, Stack, TextInput } from "@mantine/core";
+import { Box, Button, Group, Select, Stack, TextInput } from "@mantine/core";
 import type { UseFormReturnType } from "@mantine/form";
 import type { Organization } from "better-auth/plugins/organization";
-import { ALL_ORGANIZATION_ROLES, type OrganizationRole } from "@/types/types";
-import classes from "./invite-user-form.module.scss";
+import User from "@/assets/icons/user";
+import { ALL_ROLES, OrganizationRole, Role } from "@/types/types";
+
+const SYSTEM_ORG_SLUGS = ["admins", "drivers"];
 
 interface InviteUserForm {
   email: string;
+  role: Role;
   organizationRole: OrganizationRole;
   organizationId: string;
 }
@@ -18,44 +21,100 @@ interface InviteUserFormProps {
 
 const NO_ORGS_DATA = [{ value: "", label: "no organizations available", disabled: true }];
 
+const ROLE_LABELS: Record<Role, string> = {
+  [Role.ADMIN]: "Administrator",
+  [Role.DRIVER]: "Driver",
+  [Role.AGENCY]: "Agency Member",
+};
+
 export const InviteUserForm = ({ form, organizations }: InviteUserFormProps) => {
+  const selectedRole = form.values.role;
+  const showOrganizationSelect = selectedRole === Role.AGENCY;
+
+  const agencyOrganizations = organizations.filter(
+    (org) => !SYSTEM_ORG_SLUGS.includes(org.slug ?? ""),
+  );
+
+  const handleRoleChange = (role: Role) => {
+    form.setFieldValue("role", role);
+    if (role !== Role.AGENCY) {
+      form.setFieldValue("organizationId", "");
+    }
+  };
+
   return (
-    <Stack gap="lg">
+    <Stack gap="xl">
       <Stack gap="md">
-        <Box fw={500} fz="lg">
-          User Information
+        <Box fw={600} fz="lg" c="var(--color-primary)">
+          Invitee Information
         </Box>
-        <div className={classes.formRow}>
-          <TextInput
-            withAsterisk
-            label="Email"
-            placeholder="Enter email address"
-            key={form.key("email")}
-            {...form.getInputProps("email")}
-          />
-        </div>
+        <TextInput
+          withAsterisk
+          label="Email Address"
+          placeholder="example@gmail.com"
+          key={form.key("email")}
+          {...form.getInputProps("email")}
+        />
       </Stack>
-      <Divider />
-      <div className={classes.formRow}>
+
+      <Stack gap="md">
+        <Box fw={600} fz="lg" c="var(--color-primary)">
+          Role Information
+        </Box>
+        <Box>
+          <Box fw={500} mb="xs">
+            Invitee Role in the Navigation Centre
+          </Box>
+          <Group gap="sm">
+            {ALL_ROLES.map((role) => (
+              <Button
+                key={role}
+                variant={selectedRole === role ? "filled" : "default"}
+                color={selectedRole === role ? "var(--color-primary)" : "gray"}
+                leftSection={
+                  <User
+                    width="16"
+                    height="16"
+                    stroke={selectedRole === role ? "white" : "#434343"}
+                  />
+                }
+                onClick={() => handleRoleChange(role)}
+                style={{
+                  flex: 1,
+                  backgroundColor: selectedRole === role ? "var(--color-primary)" : undefined,
+                }}
+              >
+                {ROLE_LABELS[role]}
+              </Button>
+            ))}
+          </Group>
+        </Box>
         <Select
           withAsterisk
-          label="Organization Role"
-          placeholder="Pick an organization role for the user"
-          data={ALL_ORGANIZATION_ROLES}
+          label="Organization Permission Level"
+          placeholder="Select permission level"
+          data={[
+            { value: OrganizationRole.MEMBER, label: "Member" },
+            { value: OrganizationRole.ADMIN, label: "Admin" },
+          ]}
           key={form.key("organizationRole")}
           {...form.getInputProps("organizationRole")}
         />
-      </div>
-      <div className={classes.formRow}>
-        <Select
-          withAsterisk
-          label="Organization"
-          placeholder="Pick an organization to invite the user to"
-          data={organizations.map((org) => ({ value: org.id, label: org.name })) ?? NO_ORGS_DATA}
-          key={form.key("organizationId")}
-          {...form.getInputProps("organizationId")}
-        />
-      </div>
+        {showOrganizationSelect && (
+          <Select
+            withAsterisk
+            label="Affiliated Agency"
+            placeholder="Select an agency"
+            data={
+              agencyOrganizations.length > 0
+                ? agencyOrganizations.map((org) => ({ value: org.id, label: org.name }))
+                : NO_ORGS_DATA
+            }
+            key={form.key("organizationId")}
+            {...form.getInputProps("organizationId")}
+          />
+        )}
+      </Stack>
     </Stack>
   );
 };
diff --git a/src/app/_components/common/modal/modal.tsx b/src/app/_components/common/modal/modal.tsx
index 13b5b388..27af9af1 100644
--- a/src/app/_components/common/modal/modal.tsx
+++ b/src/app/_components/common/modal/modal.tsx
@@ -42,7 +42,7 @@ export default function Modal({
 }: ModalProps) {
   const isMobile = useMediaQuery("(max-width: 50em)");
   const defaultFooter = showDefaultFooter && (
-    <Group justify="flex-end" mt="md">
+    <Group justify="flex-end" mt="xl">
       <Button variant="secondary" onClick={onClose} disabled={loading}>
         {cancelText}
       </Button>
diff --git a/src/assets/icons/home.tsx b/src/assets/icons/home.tsx
index 4ee83e40..4829caa9 100644
--- a/src/assets/icons/home.tsx
+++ b/src/assets/icons/home.tsx
@@ -1,7 +1,12 @@
 import type { SVGProps } from "react";
 import { memo } from "react";
 
-const SvgComponent = ({ width = "24px", height = "24px", ...props }: SVGProps<SVGSVGElement>) => (
+const SvgComponent = ({
+  width = "24px",
+  height = "24px",
+  stroke = "#434343",
+  ...props
+}: SVGProps<SVGSVGElement>) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
     width={width}
@@ -13,96 +18,16 @@ const SvgComponent = ({ width = "24px", height = "24px", ...props }: SVGProps<SV
   >
     <title>Home</title>
     <path
-      stroke="#434343"
+      stroke={stroke}
       strokeLinecap="round"
       strokeLinejoin="round"
       strokeWidth={2}
       d="m3 9 9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V9Z"
     />
     <path
-      stroke="#000"
+      stroke={stroke}
       strokeLinecap="round"
       strokeLinejoin="round"
-      strokeOpacity={0.2}
-      strokeWidth={2}
-      d="m3 9 9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V9Z"
-    />
-    <path
-      stroke="#000"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      strokeOpacity={0.2}
-      strokeWidth={2}
-      d="m3 9 9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V9Z"
-    />
-    <path
-      stroke="#000"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      strokeOpacity={0.2}
-      strokeWidth={2}
-      d="m3 9 9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V9Z"
-    />
-    <path
-      stroke="#000"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      strokeOpacity={0.2}
-      strokeWidth={2}
-      d="m3 9 9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V9Z"
-    />
-    <path
-      stroke="#000"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      strokeOpacity={0.2}
-      strokeWidth={2}
-      d="m3 9 9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V9Z"
-    />
-    <path
-      stroke="#434343"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      strokeWidth={2}
-      d="M9 22V12h6v10"
-    />
-    <path
-      stroke="#000"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      strokeOpacity={0.2}
-      strokeWidth={2}
-      d="M9 22V12h6v10"
-    />
-    <path
-      stroke="#000"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      strokeOpacity={0.2}
-      strokeWidth={2}
-      d="M9 22V12h6v10"
-    />
-    <path
-      stroke="#000"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      strokeOpacity={0.2}
-      strokeWidth={2}
-      d="M9 22V12h6v10"
-    />
-    <path
-      stroke="#000"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      strokeOpacity={0.2}
-      strokeWidth={2}
-      d="M9 22V12h6v10"
-    />
-    <path
-      stroke="#000"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      strokeOpacity={0.2}
       strokeWidth={2}
       d="M9 22V12h6v10"
     />
diff --git a/src/assets/icons/user.tsx b/src/assets/icons/user.tsx
index da70ffff..56fd2969 100644
--- a/src/assets/icons/user.tsx
+++ b/src/assets/icons/user.tsx
@@ -1,7 +1,12 @@
 import type { SVGProps } from "react";
 import { memo } from "react";
 
-const SvgComponent = ({ width = "32px", height = "32px", ...props }: SVGProps<SVGSVGElement>) => (
+const SvgComponent = ({
+  width = "32px",
+  height = "32px",
+  stroke = "#434343",
+  ...props
+}: SVGProps<SVGSVGElement>) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
     width={width}
@@ -13,37 +18,19 @@ const SvgComponent = ({ width = "32px", height = "32px", ...props }: SVGProps<SV
   >
     <title>User</title>
     <path
-      stroke="#434343"
+      stroke={stroke}
       strokeLinecap="round"
       strokeLinejoin="round"
       strokeWidth={2}
       d="M24 25.333v-1.777c0-.943-.421-1.848-1.172-2.515C22.078 20.375 21.061 20 20 20h-8c-1.06 0-2.078.375-2.828 1.041C8.422 21.708 8 22.613 8 23.556v1.777M16 16a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z"
     />
     <path
-      stroke="#434343"
+      stroke={stroke}
       strokeLinecap="round"
       strokeLinejoin="round"
       strokeWidth={2}
       d="M16.133 29.223c7.364 0 13.333-5.97 13.333-13.334S23.496 2.556 16.133 2.556c-7.364 0-13.334 5.97-13.334 13.333 0 7.364 5.97 13.334 13.334 13.334Z"
     />
-    <g>
-      <path
-        stroke="#000"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        strokeOpacity={0.2}
-        strokeWidth={2}
-        d="M24 25.333v-1.777c0-.943-.421-1.848-1.172-2.515C22.078 20.375 21.061 20 20 20h-8c-1.06 0-2.078.375-2.828 1.041C8.422 21.708 8 22.613 8 23.556v1.777M16 16a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z"
-      />
-      <path
-        stroke="#000"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        strokeOpacity={0.2}
-        strokeWidth={2}
-        d="M16.133 29.223c7.364 0 13.333-5.97 13.333-13.334S23.496 2.556 16.133 2.556c-7.364 0-13.334 5.97-13.334 13.333 0 7.364 5.97 13.334 13.334 13.334Z"
-      />
-    </g>
   </svg>
 );
 
diff --git a/src/server/api/routers/organizations.ts b/src/server/api/routers/organizations.ts
index 99b19b6d..5445ebd7 100644
--- a/src/server/api/routers/organizations.ts
+++ b/src/server/api/routers/organizations.ts
@@ -153,7 +153,7 @@ export const organizationRouter = createTRPCRouter({
         const newUser = await auth.api.signUpEmail({
           body: {
             email: input.email,
-            name: "", // blank so they can fill it in later
+            name: "", // User will set their name when completing registration
             password: randomPassword,
           },
         });