diff --git a/src/app/create-org/page.tsx b/src/app/create-org/page.tsx
new file mode 100644
index 00000000..4e4446ac
--- /dev/null
+++ b/src/app/create-org/page.tsx
@@ -0,0 +1,23 @@
+"use client";
+
+import { CreateOrg } from "@/components/organization/create-org";
+import { toast } from "sonner";
+import { useRouter } from "next/navigation";
+import { authClient } from "@/lib/auth-client";
+
+export default function CreateOrgPage() {
+  const router = useRouter();
+  const { useActiveOrganization } = authClient;
+  const { data: activeOrganization } = useActiveOrganization();
+
+  const onSuccess = () => {
+    toast.success("Organization created successfully");
+    router.push(`/${activeOrganization?.slug}/localhost/query`);
+  };
+
+  return (
+    <div className="flex h-full w-full items-center justify-center">
+      <CreateOrg title="Create your organization" onSuccess={onSuccess} />
+    </div>
+  );
+}
diff --git a/src/app/onboarding/create-org/page.tsx b/src/app/onboarding/create-org/page.tsx
new file mode 100644
index 00000000..ea19fd45
--- /dev/null
+++ b/src/app/onboarding/create-org/page.tsx
@@ -0,0 +1,25 @@
+"use client";
+
+import { toast } from "sonner";
+import { useRouter } from "next/navigation";
+import { CreateOrg } from "@/components/organization/create-org";
+import { authClient } from "@/lib/auth-client";
+
+export default function OnboardingCreateOrgPage() {
+  const { useActiveOrganization } = authClient;
+  const { data: activeOrganization } = useActiveOrganization();
+  const router = useRouter();
+
+  const onSuccess = () => {
+    toast.success("Organization created successfully");
+    router.push(`/${activeOrganization?.slug}/localhost/query`);
+
+    // TODO
+    // router.push("/onboarding/pricing");
+  };
+  return (
+    <div className="flex h-full w-full items-center justify-center">
+      <CreateOrg title="Create your first organization" onSuccess={onSuccess} />
+    </div>
+  );
+}
diff --git a/src/app/onboarding/page.tsx b/src/app/onboarding/pricing/page.tsx
similarity index 78%
rename from src/app/onboarding/page.tsx
rename to src/app/onboarding/pricing/page.tsx
index b296e896..6be04a64 100644
--- a/src/app/onboarding/page.tsx
+++ b/src/app/onboarding/pricing/page.tsx
@@ -1,12 +1,8 @@
 "use client";
 
-import { useSearchParams } from "next/navigation";
 import OnboardingPricing from "@/components/onboarding/pricing";
 
 export default function OnboardingPage() {
-  const searchParams = useSearchParams();
-  const step = searchParams.get("step");
-
   return (
     <div className="fixed inset-0 z-50 flex items-center justify-center p-4">
       <div className="absolute inset-0 bg-black/50 dark:bg-black/70" />
diff --git a/src/app/settings/org/create-org.tsx b/src/app/settings/org/create-org.tsx
deleted file mode 100644
index 763ce58f..00000000
--- a/src/app/settings/org/create-org.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-"use client";
-
-import { Button } from "@/components/ui/button";
-import {
-  Card,
-  CardHeader,
-  CardTitle,
-  CardDescription,
-  CardContent,
-  CardFooter,
-} from "@/components/ui/card";
-import { Input } from "@/components/ui/input";
-import { authClient } from "@/lib/auth-client";
-import { Loader2 } from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
-
-export const CreateOrg = () => {
-  const { organization, useSession } = authClient;
-  const { data: session } = useSession();
-  const [orgName, setOrgName] = useState("");
-  const [isLoading, setIsLoading] = useState(false);
-
-  const handleCreateOrg = async () => {
-    setIsLoading(true);
-    await organization.create(
-      {
-        name: orgName,
-        slug: orgName,
-        userId: session?.user.id,
-        metadata: {
-          createdBy: session?.user.id,
-        },
-      },
-      {
-        onSuccess: () => {
-          toast.success("Organization created successfully");
-          setIsLoading(false);
-        },
-        onError: (error) => {
-          toast.error(`Failed to create organization: ${error.error.message}`);
-          console.error(error);
-          setIsLoading(false);
-        },
-      },
-    );
-  };
-
-  return (
-    <Card>
-      <CardHeader>
-        <CardTitle>Create New Organization</CardTitle>
-        <CardDescription>
-          Create a new organization and become its owner
-        </CardDescription>
-      </CardHeader>
-      <CardContent>
-        <Input
-          placeholder="Organization Name"
-          value={orgName}
-          onChange={(e) => setOrgName(e.target.value)}
-        />
-      </CardContent>
-      <CardFooter>
-        <Button
-          className="w-full"
-          onClick={handleCreateOrg}
-          disabled={!orgName.trim() || isLoading}
-        >
-          {isLoading ? (
-            <Loader2 className="animate-spin" />
-          ) : (
-            "Create Organization"
-          )}
-        </Button>
-      </CardFooter>
-    </Card>
-  );
-};
diff --git a/src/app/settings/org/org-setting-form.tsx b/src/app/settings/org/org-setting-form.tsx
index a945bd61..6e4e25ab 100644
--- a/src/app/settings/org/org-setting-form.tsx
+++ b/src/app/settings/org/org-setting-form.tsx
@@ -36,6 +36,7 @@ import {
 } from "@/components/ui/select";
 import { Member, Invitation, Organization } from "better-auth/plugins";
 import { User } from "better-auth";
+import { useRouter } from "next/navigation";
 
 interface Role {
   value: "owner" | "admin" | "member";
@@ -74,7 +75,13 @@ export const OrgSettingForm = ({
   activeOrganization,
   user,
 }: OrgSettingFormProps) => {
-  const { organization } = authClient;
+  const router = useRouter();
+  const { organization, useListOrganizations } = authClient;
+  const { data: allOrganizations } = useListOrganizations();
+
+  const isLastOrganization = !!(
+    allOrganizations && allOrganizations.length <= 1
+  );
 
   const [email, setEmail] = useState("");
   const [orgName, setOrgName] = useState("");
@@ -208,14 +215,33 @@ export const OrgSettingForm = ({
   };
 
   const handleDeleteOrg = async () => {
+    if (isLastOrganization) {
+      toast.error(
+        "Cannot delete your last organization. Create a new organization before deleting this one.",
+      );
+      return;
+    }
     setIsDeletingOrg(true);
     await organization.delete(
       {
         organizationId: activeOrganization?.id,
       },
       {
-        onSuccess: () => {
+        onSuccess: async () => {
           toast.success("Organization deleted successfully");
+
+          const remainingOrgs = allOrganizations?.filter(
+            (org) => org.id !== activeOrganization?.id,
+          );
+
+          if (!remainingOrgs || remainingOrgs.length === 0) return;
+
+          await organization.setActive({
+            organizationId: remainingOrgs[0].id,
+          });
+          toast.info(`Switched to ${remainingOrgs[0].name}`);
+          router.refresh();
+
           setIsDeletingOrg(false);
         },
         onError: (error) => {
@@ -534,28 +560,6 @@ export const OrgSettingForm = ({
         </>
       }
 
-      {/* Create New Organization */}
-      <Card>
-        <CardHeader>
-          <CardTitle>Create New Organization</CardTitle>
-          <CardDescription>
-            Create a new organization and become its owner
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <div className="flex gap-3">
-            <Input
-              placeholder="New organization name"
-              value={orgName}
-              onChange={(e) => setOrgName(e.target.value)}
-            />
-            <Button onClick={handleCreateOrg} disabled={!orgName.trim()}>
-              Create Organization
-            </Button>
-          </div>
-        </CardContent>
-      </Card>
-
       {/* Danger Zone */}
       {
         <Card className="border-red-200">
@@ -573,14 +577,16 @@ export const OrgSettingForm = ({
                     Delete Organization
                   </p>
                   <p className="text-muted-foreground text-sm">
-                    Permanently delete this organization and all its data
+                    {isLastOrganization
+                      ? "You must have at least one organization. Create another organization before deleting this one."
+                      : "Permanently delete this organization and all its data"}
                   </p>
                 </div>
                 <Button
                   variant="destructive"
                   size="sm"
                   onClick={handleDeleteOrg}
-                  disabled={isDeletingOrg}
+                  disabled={isDeletingOrg || isLastOrganization}
                   className="w-24"
                 >
                   {isDeletingOrg ? (
diff --git a/src/app/settings/org/page.tsx b/src/app/settings/org/page.tsx
index 8d2addce..72e13409 100644
--- a/src/app/settings/org/page.tsx
+++ b/src/app/settings/org/page.tsx
@@ -1,56 +1,25 @@
 "use client";
 
-import { useMemo } from "react";
 import { authClient } from "@/lib/auth-client";
 import LoadingIndicator from "@/components/loading-indicator";
-import { CreateOrg } from "@/app/settings/org/create-org";
 import { OrgSettingForm } from "@/app/settings/org/org-setting-form";
-import { OrgSwitcher } from "@/components/header/org-switcher";
 
 export default function OrgSettingsPage() {
-  const { useSession, useActiveOrganization, useListOrganizations } =
-    authClient;
+  const { useSession, useActiveOrganization } = authClient;
   const { data: session } = useSession();
   const { data: activeOrganization, isPending: isActiveOrganizationPending } =
     useActiveOrganization();
-  const { data: listOrganizations, isPending: isListOrganizationsPending } =
-    useListOrganizations();
 
-  const render = useMemo(() => {
-    if (!session) return;
+  if (isActiveOrganizationPending) {
+    return <LoadingIndicator />;
+  }
 
-    if (isActiveOrganizationPending || isListOrganizationsPending)
-      return <LoadingIndicator />;
-    if (!activeOrganization) {
-      if (listOrganizations && listOrganizations.length > 0) {
-        return (
-          <div className="flex h-full w-full items-center justify-center">
-            <div className="w-full">
-              <p className="font-semibold">Select an organization first</p>
-              <OrgSwitcher user={session?.user} />
-            </div>
-          </div>
-        );
-      } else {
-        return (
-          <div className="flex h-full w-full items-center justify-center">
-            <CreateOrg />
-          </div>
-        );
-      }
-    }
-    return (
-      <OrgSettingForm
-        activeOrganization={activeOrganization}
-        user={session.user}
-      />
-    );
-  }, [
-    isActiveOrganizationPending,
-    activeOrganization,
-    listOrganizations,
-    session,
-  ]);
+  if (!activeOrganization || !session?.user) return;
 
-  return render;
+  return (
+    <OrgSettingForm
+      activeOrganization={activeOrganization}
+      user={session?.user}
+    />
+  );
 }
diff --git a/src/app/sign-up/page.tsx b/src/app/sign-up/page.tsx
index 4f1c253c..6a672b26 100644
--- a/src/app/sign-up/page.tsx
+++ b/src/app/sign-up/page.tsx
@@ -120,7 +120,7 @@ export default function SignUpPage() {
         password,
         name: username,
         username,
-        callbackURL: "/sign-up/success",
+        callbackURL: "/onboarding/create-org",
       },
       {
         onRequest: (ctx) => {
diff --git a/src/components/header/index.tsx b/src/components/header/index.tsx
index e2df54db..33a502b2 100644
--- a/src/components/header/index.tsx
+++ b/src/components/header/index.tsx
@@ -12,6 +12,8 @@ import { EnvSwitcher } from "@/components/header/env-switcher";
 import { BetaBadge } from "@/components/beta-badge";
 import { Logo } from "@/components/header/logo";
 import { authClient } from "@/lib/auth-client";
+import { useOrganizationStore } from "@/stores/organization-store";
+import { useEffect } from "react";
 
 const navItems = [
   {
@@ -30,11 +32,27 @@ const navItems = [
 ];
 
 export const Header = () => {
-  const { useSession, useActiveOrganization } = authClient;
+  const { useSession, useActiveOrganization, organization } = authClient;
   const { data: session, isPending: isPendingSession } = useSession();
   const { data: activeOrganization } = useActiveOrganization();
   const user = session?.user;
 
+  const { lastActiveOrgId, setLastActiveOrgId } = useOrganizationStore();
+
+  useEffect(() => {
+    if (lastActiveOrgId) {
+      organization.setActive({
+        organizationId: lastActiveOrgId,
+      });
+    }
+  }, [lastActiveOrgId]);
+
+  useEffect(() => {
+    if (activeOrganization) {
+      setLastActiveOrgId(activeOrganization.id);
+    }
+  }, [activeOrganization]);
+
   return (
     <NavigationMenu>
       <NavigationMenuList className="fixed top-0 z-20 flex h-12 w-full items-center justify-between border-b bg-neutral-50 px-5 dark:bg-neutral-950">
diff --git a/src/components/header/org-switcher.tsx b/src/components/header/org-switcher.tsx
index 4fdd617c..6aaf4231 100644
--- a/src/components/header/org-switcher.tsx
+++ b/src/components/header/org-switcher.tsx
@@ -1,4 +1,4 @@
-import { usePathname } from "next/navigation";
+import { usePathname, useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 import {
   Select,
@@ -13,6 +13,7 @@ import { User } from "better-auth";
 import { authClient } from "@/lib/auth-client";
 import { Organization } from "better-auth/plugins";
 import { Skeleton } from "@/components/ui/skeleton";
+import { useOrganizationStore } from "@/stores/organization-store";
 
 interface Source {
   name: string;
@@ -24,6 +25,7 @@ interface OrgSwitcherProps {
 }
 
 export const OrgSwitcher = ({ user }: OrgSwitcherProps) => {
+  const router = useRouter();
   const pathname = usePathname();
   const { activeEnvironment } = useEnvironmentStore();
   const { useListOrganizations, organization, useActiveOrganization } =
@@ -33,15 +35,24 @@ export const OrgSwitcher = ({ user }: OrgSwitcherProps) => {
   const { data: activeOrganization, isPending: isActiveOrganizationPending } =
     useActiveOrganization();
 
+  const { setLastActiveOrgId } = useOrganizationStore();
+
   const [menuList, setMenuList] = useState<Source[]>([]);
 
   const updateSelection = (value: string) => {
     const selected = menuList.find((menu) => menu.value === value);
     if (!selected) return;
 
+    if (value === "add-new") {
+      router.push("/create-org");
+      return;
+    }
+
     organization.setActive({
       organizationId: value,
     });
+
+    setLastActiveOrgId(value);
   };
 
   useEffect(() => {
@@ -53,6 +64,11 @@ export const OrgSwitcher = ({ user }: OrgSwitcherProps) => {
       });
     });
 
+    _menuList.push({
+      name: "+ Add new",
+      value: "add-new",
+    });
+
     setMenuList(_menuList);
   }, [listOrganizations, user, activeEnvironment, pathname]);
 
diff --git a/src/components/onboarding/pricing.tsx b/src/components/onboarding/pricing.tsx
index 46d7f34c..dfb16915 100644
--- a/src/components/onboarding/pricing.tsx
+++ b/src/components/onboarding/pricing.tsx
@@ -32,11 +32,7 @@ export default function OnboardingPricing() {
       onSuccess: () => {
         toast.success("You're all set with the free plan.");
         if (!activeOrganization || !activeEnvironment) return;
-        const url = getOrgEnvUrl(
-          activeOrganization,
-          activeEnvironment,
-          activePage,
-        );
+        const url = `${activeOrganization?.slug}/localhost/query`;
         router.push(url);
       },
       onError: (error) => {
diff --git a/src/components/organization/create-org.tsx b/src/components/organization/create-org.tsx
new file mode 100644
index 00000000..14d26b50
--- /dev/null
+++ b/src/components/organization/create-org.tsx
@@ -0,0 +1,131 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+import { authClient } from "@/lib/auth-client";
+import {
+  Form,
+  FormLabel,
+  FormField,
+  FormItem,
+  FormControl,
+  FormMessage,
+} from "@/components/ui/form";
+import { z } from "zod";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useForm } from "node_modules/react-hook-form";
+import { Input } from "@/components/ui/input";
+import { Button } from "@/components/ui/button";
+import { Separator } from "@/components/ui/separator";
+import { toast } from "sonner";
+import { useState } from "react";
+import { Loader2 } from "lucide-react";
+
+const FormSchema = z.object({
+  name: z.string().min(1, "Organization name is required."),
+});
+type FormData = z.infer<typeof FormSchema>;
+
+interface CreateOrgProps {
+  title: string;
+  onSuccess: () => void;
+}
+
+export const CreateOrg = ({ title, onSuccess }: CreateOrgProps) => {
+  const router = useRouter();
+  const { organization, useSession } = authClient;
+  const { data: session } = useSession();
+
+  const [isCreatingOrg, setIsCreatingOrg] = useState(false);
+
+  const form = useForm<FormData>({
+    resolver: zodResolver(FormSchema),
+    defaultValues: {
+      name: "",
+    },
+  });
+
+  const { setError } = form;
+
+  const onSubmit = async (data: FormData) => {
+    setIsCreatingOrg(true);
+    const { name } = data;
+    await organization.create(
+      {
+        name,
+        slug: name,
+        userId: session?.user.id,
+        keepCurrentActiveOrganization: false,
+        metadata: {
+          createdBy: session?.user.id,
+        },
+      },
+      {
+        onSuccess: () => {
+          onSuccess();
+          setIsCreatingOrg(false);
+        },
+        onError: (error) => {
+          const { message } = error.error;
+          setError("name", { message });
+          toast.error(`Failed to create organization: ${message}`);
+          setIsCreatingOrg(false);
+        },
+      },
+    );
+  };
+
+  return (
+    <div className="flex max-w-[579px] flex-col items-center justify-center">
+      <div className="flex flex-col items-center rounded-lg bg-neutral-100 px-8 py-7 dark:bg-neutral-900">
+        <h1 className="text-xl font-semibold">{title}</h1>
+        <p className="text-muted-foreground mt-3 text-sm font-normal">
+          Set up the workspace where your team will manage services and
+          environments.
+        </p>
+        <div className="mt-5 w-[320px]">
+          <Form {...form}>
+            <form onSubmit={form.handleSubmit(onSubmit)}>
+              <FormField
+                control={form.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Organization name</FormLabel>
+                    <FormControl className="mt-2">
+                      <Input
+                        {...field}
+                        placeholder="Enter your organization name"
+                      />
+                    </FormControl>
+                    <div className="h-7">
+                      <FormMessage />
+                    </div>
+                  </FormItem>
+                )}
+              />
+              <Button type="submit" className="w-full" disabled={isCreatingOrg}>
+                {isCreatingOrg ? (
+                  <Loader2 className="animate-spin" />
+                ) : (
+                  "Create organization"
+                )}
+              </Button>
+            </form>
+          </Form>
+        </div>
+      </div>
+      <div className="my-10 flex w-full items-center justify-center">
+        <Separator className="flex-1" />
+        <span className="text-muted-foreground mx-3 text-sm">Or</span>
+        <Separator className="flex-1" />
+      </div>
+      <div className="flex w-full flex-col items-center rounded-lg bg-neutral-100 px-8 py-7 dark:bg-neutral-900">
+        <p className="text-base font-medium">Join existing organization</p>
+        <p className="text-muted-foreground mt-2 text-center text-sm font-normal">
+          Please contact an administrator of the existing <br />
+          organization and request an invitation.
+        </p>
+      </div>
+    </div>
+  );
+};
diff --git a/src/stores/organization-store.ts b/src/stores/organization-store.ts
new file mode 100644
index 00000000..41f4ed0a
--- /dev/null
+++ b/src/stores/organization-store.ts
@@ -0,0 +1,21 @@
+import { create } from "zustand";
+import { persist } from "zustand/middleware";
+
+interface OrganizationStore {
+  lastActiveOrgId: string | null;
+  setLastActiveOrgId: (orgId: string) => void;
+  clearLastActiveOrgId: () => void;
+}
+
+export const useOrganizationStore = create<OrganizationStore>()(
+  persist(
+    (set) => ({
+      lastActiveOrgId: null,
+      setLastActiveOrgId: (orgId) => set({ lastActiveOrgId: orgId }),
+      clearLastActiveOrgId: () => set({ lastActiveOrgId: null }),
+    }),
+    {
+      name: "organization-storage",
+    },
+  ),
+);