diff --git a/apps/web/pages/settings/teams/new/[[...step]].tsx b/apps/web/pages/settings/teams/new/[[...step]].tsx
index 6231d94685..21d71ca5f6 100644
--- a/apps/web/pages/settings/teams/new/[[...step]].tsx
+++ b/apps/web/pages/settings/teams/new/[[...step]].tsx
@@ -20,6 +20,7 @@ import {
 import { CAL_URL } from "@calcom/lib/constants";
 import { STRIPE_PUBLISHABLE_KEY } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { localStorage } from "@calcom/lib/webstorage";
 import { trpc } from "@calcom/trpc/react";
 import { showToast } from "@calcom/ui/v2";
 
@@ -67,30 +68,9 @@ const CreateNewTeamPage = () => {
   const result = stepRouteSchema.safeParse(router.query);
   const currentStep = result.success ? result.data.step[0] : INITIAL_STEP;
 
-  // Set current user as team owner
-  useEffect(() => {
-    if (!session.data) router.push(`${CAL_URL}/settings/profile`);
-    if (session.status !== "loading" && !newTeamData.members.length) {
-      setNewTeamData({
-        ...newTeamData,
-        members: [
-          {
-            name: session?.data?.user.name || "",
-            email: session?.data?.user.email || "",
-            username: session?.data?.user.username || "",
-            id: session?.data?.user.id,
-            avatar: session?.data?.user.avatar || "",
-            role: "OWNER",
-            locale: session?.data?.user.locale || "en",
-          },
-        ],
-      });
-    }
-    /* eslint-disable */
-  }, [session]);
-
   const createTemporaryTeamMutation = trpc.useMutation(["viewer.teams.createTemporaryTeam"], {
-    onSuccess: () => {
+    onSuccess: (data) => {
+      localStorage.setItem("temporaryTeamSlug", data.metadata.temporarySlug);
       goToIndex(1);
     },
   });
diff --git a/packages/features/ee/teams/components/v2/AddNewTeamMembers.tsx b/packages/features/ee/teams/components/v2/AddNewTeamMembers.tsx
index 8ec04d653f..cb46929bde 100644
--- a/packages/features/ee/teams/components/v2/AddNewTeamMembers.tsx
+++ b/packages/features/ee/teams/components/v2/AddNewTeamMembers.tsx
@@ -1,3 +1,4 @@
+import { useSession } from "next-auth/react";
 import { useEffect, useState } from "react";
 import { Controller, useForm } from "react-hook-form";
 
@@ -5,6 +6,7 @@ import MemberInvitationModal from "@calcom/features/ee/teams/components/MemberIn
 import { classNames } from "@calcom/lib";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { localStorage } from "@calcom/lib/webstorage";
 import { trpc } from "@calcom/trpc/react";
 import { Icon } from "@calcom/ui";
 import { Avatar } from "@calcom/ui/components/avatar";
@@ -31,6 +33,7 @@ const AddNewTeamMembers = ({
   deleteNewTeamMember: (email: string) => void;
 }) => {
   const { t } = useLocale();
+  const session = useSession();
 
   const [memberInviteModal, setMemberInviteModal] = useState(false);
   const [inviteMemberInput, setInviteMemberInput] = useState<NewMemberForm>({
@@ -40,17 +43,47 @@ const AddNewTeamMembers = ({
   });
   const [skeletonMember, setSkeletonMember] = useState(false);
   const [billingFrequency, setBillingFrequency] = useState("monthly");
-
+  const [team, setTeam] = useState();
   const numberOfMembers = newTeamData.members.length;
 
   const formMethods = useForm({
     defaultValues: {
       members: newTeamData.members,
-      billingFrequency: "monthly",
     },
   });
 
-  const { refetch } = trpc.useQuery(["viewer.teams.findUser", inviteMemberInput], {
+  // Set current user as team owner
+  // useEffect(() => {
+  //   if (!session.data) router.push(`${CAL_URL}/settings/profile`);
+  //   if (session.status !== "loading" && !team.length) {
+  //     setNewTeamData({
+  //       ...newTeamData,
+  //       members: [
+  //         {
+  //           name: session?.data?.user.name || "",
+  //           email: session?.data?.user.email || "",
+  //           username: session?.data?.user.username || "",
+  //           id: session?.data?.user.id,
+  //           avatar: session?.data?.user.avatar || "",
+  //           role: "OWNER",
+  //           locale: session?.data?.user.locale || "en",
+  //         },
+  //       ],
+  //     });
+  //   }
+  //   /* eslint-disable */
+  // }, [session, team]);
+
+  const retrieveTemporaryTeam = trpc.useQuery(
+    ["viewer.teams.retrieveTemporaryTeam", { temporarySlug: localStorage.getItem("temporaryTeamSlug") }],
+    {
+      onSuccess: (data) => {
+        if (data) setTeam(data);
+      },
+    }
+  );
+
+  const findUser = trpc.useQuery(["viewer.teams.findUser", inviteMemberInput], {
     refetchOnWindowFocus: false,
     enabled: false,
     onSuccess: (newMember) => {
@@ -65,7 +98,7 @@ const AddNewTeamMembers = ({
 
   useEffect(() => {
     if (inviteMemberInput.emailOrUsername) {
-      refetch();
+      findUser.refetch();
     }
     // eslint-disable-next-line
   }, [inviteMemberInput]);
@@ -83,7 +116,7 @@ const AddNewTeamMembers = ({
           <div>
             <ul className="rounded-md border">
               {newTeamData.members &&
-                newTeamData.members.map((member: PendingMember, index: number) => (
+                team.members.map((member: PendingMember, index: number) => (
                   <li
                     key={member.email}
                     className={classNames(
diff --git a/packages/trpc/server/routers/viewer/teams.tsx b/packages/trpc/server/routers/viewer/teams.tsx
index 0b9982f725..82e23ed494 100644
--- a/packages/trpc/server/routers/viewer/teams.tsx
+++ b/packages/trpc/server/routers/viewer/teams.tsx
@@ -784,9 +784,11 @@ export const viewerTeamsRouter = createProtectedRouter()
   })
   .query("retrieveTemporaryTeam", {
     input: z.object({
-      temporarySlug: z.string(),
+      temporarySlug: z.union[(z.string(), z.null())],
     }),
     async resolve({ ctx, input }) {
-      return;
+      if (!input.temporarySlug) {
+        return;
+      }
     },
   });