diff --git a/packages/web/src/actions.ts b/packages/web/src/actions.ts
index ab8d199a..f4b2296c 100644
--- a/packages/web/src/actions.ts
+++ b/packages/web/src/actions.ts
@@ -19,7 +19,7 @@ import { headers } from "next/headers"
 import { getStripe } from "@/lib/stripe"
 import { getUser } from "@/data/user";
 import { Session } from "next-auth";
-import { STRIPE_PRODUCT_ID, CONFIG_MAX_REPOS_NO_TOKEN, EMAIL_FROM, SMTP_CONNECTION_URL } from "@/lib/environment";
+import { STRIPE_PRODUCT_ID, CONFIG_MAX_REPOS_NO_TOKEN, EMAIL_FROM, SMTP_CONNECTION_URL, AUTH_URL } from "@/lib/environment";
 import Stripe from "stripe";
 import { OnboardingSteps } from "./lib/constants";
 import { render } from "@react-email/components";
@@ -593,7 +593,7 @@ export const createInvites = async (emails: string[], domain: string): Promise<{
                     const inviteLink = `${origin}/redeem?invite_id=${invite.id}`;
                     const transport = createTransport(SMTP_CONNECTION_URL);
                     const html = await render(InviteUserEmail({
-                        baseUrl: 'https://sourcebot.app',
+                        baseUrl: AUTH_URL,
                         host: {
                             name: session.user.name ?? undefined,
                             email: session.user.email!,
diff --git a/packages/web/src/app/onboard/components/orgCreateForm.tsx b/packages/web/src/app/onboard/components/orgCreateForm.tsx
index 0197fda4..33b36df2 100644
--- a/packages/web/src/app/onboard/components/orgCreateForm.tsx
+++ b/packages/web/src/app/onboard/components/orgCreateForm.tsx
@@ -105,8 +105,8 @@ export function OrgCreateForm() {
                                 <FormLabel>Organization Domain</FormLabel>
                                 <FormControl>
                                     <div className="flex items-center">
+                                        <span className="ml-2">staging.sourcebot.dev/</span>
                                         <Input placeholder="aperature-labs" {...field} className="w-1/2" />
-                                        <span className="ml-2">.sourcebot.app</span>
                                     </div>
                                 </FormControl>
                                 <FormMessage />
diff --git a/packages/web/src/auth.ts b/packages/web/src/auth.ts
index 6a830b41..54ed7c5c 100644
--- a/packages/web/src/auth.ts
+++ b/packages/web/src/auth.ts
@@ -65,7 +65,7 @@ export const getProviders = () => {
             maxAge: 60 * 10,
             sendVerificationRequest: async ({ identifier, url, provider }) => {
                 const transport = createTransport(provider.server);
-                const html = await render(MagicLinkEmail({ magicLink: url, baseUrl: 'https://sourcebot.app' }));
+                const html = await render(MagicLinkEmail({ magicLink: url, baseUrl: AUTH_URL }));
                 const result = await transport.sendMail({
                     to: identifier,
                     from: provider.from,