diff --git a/app/client/ui/CreateTeamModal.ts b/app/client/ui/CreateTeamModal.ts
index 4c633e98..4dccfc2e 100644
--- a/app/client/ui/CreateTeamModal.ts
+++ b/app/client/ui/CreateTeamModal.ts
@@ -136,7 +136,9 @@ function buildTeamPage({
       }
       await create();
     } finally {
-      disabled.set(false);
+      if (!disabled.isDisposed()) {
+        disabled.set(false);
+      }
     }
   }
   const clickOnEnter = dom.onKeyPress({
diff --git a/app/gen-server/entity/Product.ts b/app/gen-server/entity/Product.ts
index 0ecde6da..42ce6526 100644
--- a/app/gen-server/entity/Product.ts
+++ b/app/gen-server/entity/Product.ts
@@ -147,12 +147,11 @@ export const PRODUCTS: IProduct[] = [
  */
 export function getDefaultProductNames() {
   const defaultProduct = process.env.GRIST_DEFAULT_PRODUCT;
-  const personalFreePlan = PERSONAL_FREE_PLAN;
   return {
     // Personal site start off on a functional plan.
-    personal: defaultProduct || personalFreePlan,
+    personal: defaultProduct || PERSONAL_FREE_PLAN,
      // Team site starts off on a limited plan, requiring subscription.
-    teamInitial: defaultProduct || 'stub',
+    teamInitial: defaultProduct || STUB_PLAN,
     // Team site that has been 'turned off'.
     teamCancel: 'suspended',
     // Functional team site.
diff --git a/stubs/app/server/server.ts b/stubs/app/server/server.ts
index cfb13172..20ab2d26 100644
--- a/stubs/app/server/server.ts
+++ b/stubs/app/server/server.ts
@@ -7,7 +7,6 @@
 import {commonUrls} from 'app/common/gristUrls';
 import {isAffirmative} from 'app/common/gutil';
 import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager';
-import {TEAM_FREE_PLAN} from 'app/common/Features';
 
 const debugging = isAffirmative(process.env.DEBUG) || isAffirmative(process.env.VERBOSE);
 
@@ -90,7 +89,6 @@ async function setupDb() {
       }, {
         setUserAsOwner: false,
         useNewPlan: true,
-        product: TEAM_FREE_PLAN
       }));
     }
   }