diff --git a/apps/backend/src/app/api/latest/users/crud.tsx b/apps/backend/src/app/api/latest/users/crud.tsx
index 52265b5cf..c2956f53d 100644
--- a/apps/backend/src/app/api/latest/users/crud.tsx
+++ b/apps/backend/src/app/api/latest/users/crud.tsx
@@ -728,7 +728,7 @@ export const usersCrudHandlers = createLazyProxy(() => createCrudHandlers(usersC
     });
 
     if (auth.tenancy.config.create_team_on_sign_up) {
-      await teamsCrudHandlers.adminCreate({
+      const team = await teamsCrudHandlers.adminCreate({
         data: {
           display_name: data.display_name ?
             `${data.display_name}'s Team` :
@@ -740,6 +740,19 @@ export const usersCrudHandlers = createLazyProxy(() => createCrudHandlers(usersC
         tenancy: auth.tenancy,
         user: result,
       });
+
+      await prismaClient.teamMember.update({
+        where: {
+          tenancyId_projectUserId_teamId: {
+            tenancyId: auth.tenancy.id,
+            projectUserId: result.id,
+            teamId: team.id,
+          },
+        },
+        data: {
+          isSelected: BooleanTrue.TRUE,
+        },
+      });
     }
 
     runAsynchronouslyAndWaitUntil(sendUserCreatedWebhook({
diff --git a/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.ts b/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.ts
index e210867c8..bfdf2a840 100644
--- a/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.ts
+++ b/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.ts
@@ -856,6 +856,7 @@ export class _StackClientAppImplIncomplete<HasTokenStore extends boolean, Projec
       async createTeam(data: TeamCreateOptions) {
         const crud = await app._interface.createClientTeam(teamCreateOptionsToCrud(data, 'me'), session);
         await app._currentUserTeamsCache.refresh([session]);
+        await this.update({ selectedTeamId: crud.id });
         return app._clientTeamFromCrud(crud, session);
       },
       async leaveTeam(team: Team) {
diff --git a/packages/template/src/lib/stack-app/apps/implementations/server-app-impl.ts b/packages/template/src/lib/stack-app/apps/implementations/server-app-impl.ts
index d95f26f03..a23a6111a 100644
--- a/packages/template/src/lib/stack-app/apps/implementations/server-app-impl.ts
+++ b/packages/template/src/lib/stack-app/apps/implementations/server-app-impl.ts
@@ -308,6 +308,7 @@ export class _StackServerAppImplIncomplete<HasTokenStore extends boolean, Projec
           ...data,
         }));
         await app._serverTeamsCache.refresh([undefined]);
+        await app._updateServerUser(crud.id, { selectedTeamId: team.id });
         return app._serverTeamFromCrud(team);
       },
       leaveTeam: async (team: Team) => {