diff --git a/apps/web/src/app/admin-console/organizations/members/people.component.ts b/apps/web/src/app/admin-console/organizations/members/people.component.ts
index 896d88090f..1ab5f250fe 100644
--- a/apps/web/src/app/admin-console/organizations/members/people.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/people.component.ts
@@ -431,14 +431,14 @@ export class PeopleComponent
     // Click on user email: Edit Flow
 
     // User attempting to invite new users in a free org with max users
-    if (!user && this.allUsers.length === this.organization.seats) {
+    if (
+      !user &&
+      this.allUsers.length === this.organization.seats &&
+      (this.organization.planProductType === ProductType.Free ||
+        this.organization.planProductType === ProductType.TeamsStarter)
+    ) {
       // Show org upgrade modal
-      if (
-        this.organization.planProductType === ProductType.Free ||
-        this.organization.planProductType === ProductType.TeamsStarter
-      ) {
-        await this.showSeatLimitReachedDialog();
-      }
+      await this.showSeatLimitReachedDialog();
       return;
     }
 
diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts
index f02fd89d98..34e55345b8 100644
--- a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts
+++ b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts
@@ -139,7 +139,7 @@ export class TrialInitiationComponent implements OnInit, OnDestroy {
 
       if (this.trialFlowOrgs.includes(qParams.org)) {
         this.org = qParams.org;
-        this.orgLabel = this.titleCasePipe.transform(this.org);
+        this.orgLabel = this.titleCasePipe.transform(this.orgDisplayName);
         this.useTrialStepper = true;
         this.referenceData.flow = qParams.org;
 
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.html b/apps/web/src/app/billing/organizations/organization-plans.component.html
index ff0458c39a..6e587ebc2d 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.html
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.html
@@ -52,7 +52,9 @@
     <label class="form-check-label" for="product{{ selectableProduct.product }}">
       {{ selectableProduct.nameLocalizationKey | i18n }}
       <small class="mb-1">{{ selectableProduct.descriptionLocalizationKey | i18n : "1" }}</small>
-      <ng-container *ngIf="selectableProduct.product === productTypes.Enterprise">
+      <ng-container
+        *ngIf="selectableProduct.product === productTypes.Enterprise; else nonEnterprisePlans"
+      >
         <small>• {{ "includeAllTeamsFeatures" | i18n }}</small>
         <small *ngIf="selectableProduct.hasSelfHost">• {{ "onPremHostingOptional" | i18n }}</small>
         <small *ngIf="selectableProduct.hasSso">• {{ "includeSsoAuthentication" | i18n }}</small>
@@ -64,69 +66,78 @@
           {{ "xDayFreeTrial" | i18n : selectableProduct.trialPeriodDays }}
         </small>
       </ng-container>
-      <ng-container
-        *ngIf="
-          teamsStarterPlanFeatureFlagIsEnabled && selectableProduct.product === productTypes.Teams;
-          else fullFeatureList
-        "
-      >
-        <small>• {{ "includeAllTeamsStarterFeatures" | i18n }}</small>
-        <small>• {{ "chooseMonthlyOrAnnualBilling" | i18n }}</small>
-        <small>• {{ "abilityToAddMoreThanNMembers" | i18n : 10 }}</small>
-        <small *ngIf="selectableProduct.trialPeriodDays && createOrganization">
-          • {{ "xDayFreeTrial" | i18n : selectableProduct.trialPeriodDays }}
-        </small>
-      </ng-container>
-      <ng-template #fullFeatureList>
-        <small *ngIf="selectableProduct.product == productTypes.Free"
-          >• {{ "limitedUsers" | i18n : selectableProduct.PasswordManager.maxSeats }}</small
-        >
-        <small
+      <ng-template #nonEnterprisePlans>
+        <ng-container
           *ngIf="
-            selectableProduct.product != productTypes.Free &&
-            selectableProduct.product != productTypes.TeamsStarter &&
-            selectableProduct.PasswordManager.maxSeats
+            teamsStarterPlanFeatureFlagIsEnabled &&
+              selectableProduct.product === productTypes.Teams;
+            else fullFeatureList
           "
-          >• {{ "addShareLimitedUsers" | i18n : selectableProduct.PasswordManager.maxSeats }}</small
         >
-        <small *ngIf="!selectableProduct.PasswordManager.maxSeats"
-          >• {{ "addShareUnlimitedUsers" | i18n }}</small
-        >
-        <small *ngIf="selectableProduct.PasswordManager.maxCollections"
-          >•
-          {{
-            "limitedCollections" | i18n : selectableProduct.PasswordManager.maxCollections
-          }}</small
-        >
-        <small *ngIf="selectableProduct.PasswordManager.maxAdditionalSeats"
-          >•
-          {{
-            "addShareLimitedUsers" | i18n : selectableProduct.PasswordManager.maxAdditionalSeats
-          }}</small
-        >
-        <small *ngIf="!selectableProduct.PasswordManager.maxCollections"
-          >• {{ "createUnlimitedCollections" | i18n }}</small
-        >
-        <small *ngIf="selectableProduct.PasswordManager.baseStorageGb"
-          >•
-          {{
-            "gbEncryptedFileStorage" | i18n : selectableProduct.PasswordManager.baseStorageGb + "GB"
-          }}</small
-        >
-        <small *ngIf="selectableProduct.hasGroups">• {{ "controlAccessWithGroups" | i18n }}</small>
-        <small *ngIf="selectableProduct.hasApi">• {{ "trackAuditLogs" | i18n }}</small>
-        <small *ngIf="selectableProduct.hasDirectory"
-          >• {{ "syncUsersFromDirectory" | i18n }}</small
-        >
-        <small *ngIf="selectableProduct.hasSelfHost">• {{ "onPremHostingOptional" | i18n }}</small>
-        <small *ngIf="selectableProduct.usersGetPremium">• {{ "usersGetPremium" | i18n }}</small>
-        <small *ngIf="selectableProduct.product != productTypes.Free"
-          >• {{ "priorityCustomerSupport" | i18n }}</small
-        >
-        <small *ngIf="selectableProduct.trialPeriodDays && createOrganization"
-          >•
-          {{ "xDayFreeTrial" | i18n : selectableProduct.trialPeriodDays }}
-        </small>
+          <small>• {{ "includeAllTeamsStarterFeatures" | i18n }}</small>
+          <small>• {{ "chooseMonthlyOrAnnualBilling" | i18n }}</small>
+          <small>• {{ "abilityToAddMoreThanNMembers" | i18n : 10 }}</small>
+          <small *ngIf="selectableProduct.trialPeriodDays && createOrganization">
+            • {{ "xDayFreeTrial" | i18n : selectableProduct.trialPeriodDays }}
+          </small>
+        </ng-container>
+        <ng-template #fullFeatureList>
+          <small *ngIf="selectableProduct.product == productTypes.Free"
+            >• {{ "limitedUsers" | i18n : selectableProduct.PasswordManager.maxSeats }}</small
+          >
+          <small
+            *ngIf="
+              selectableProduct.product != productTypes.Free &&
+              selectableProduct.product != productTypes.TeamsStarter &&
+              selectableProduct.PasswordManager.maxSeats
+            "
+            >•
+            {{ "addShareLimitedUsers" | i18n : selectableProduct.PasswordManager.maxSeats }}</small
+          >
+          <small *ngIf="!selectableProduct.PasswordManager.maxSeats"
+            >• {{ "addShareUnlimitedUsers" | i18n }}</small
+          >
+          <small *ngIf="selectableProduct.PasswordManager.maxCollections"
+            >•
+            {{
+              "limitedCollections" | i18n : selectableProduct.PasswordManager.maxCollections
+            }}</small
+          >
+          <small *ngIf="selectableProduct.PasswordManager.maxAdditionalSeats"
+            >•
+            {{
+              "addShareLimitedUsers" | i18n : selectableProduct.PasswordManager.maxAdditionalSeats
+            }}</small
+          >
+          <small *ngIf="!selectableProduct.PasswordManager.maxCollections"
+            >• {{ "createUnlimitedCollections" | i18n }}</small
+          >
+          <small *ngIf="selectableProduct.PasswordManager.baseStorageGb"
+            >•
+            {{
+              "gbEncryptedFileStorage"
+                | i18n : selectableProduct.PasswordManager.baseStorageGb + "GB"
+            }}</small
+          >
+          <small *ngIf="selectableProduct.hasGroups"
+            >• {{ "controlAccessWithGroups" | i18n }}</small
+          >
+          <small *ngIf="selectableProduct.hasApi">• {{ "trackAuditLogs" | i18n }}</small>
+          <small *ngIf="selectableProduct.hasDirectory"
+            >• {{ "syncUsersFromDirectory" | i18n }}</small
+          >
+          <small *ngIf="selectableProduct.hasSelfHost"
+            >• {{ "onPremHostingOptional" | i18n }}</small
+          >
+          <small *ngIf="selectableProduct.usersGetPremium">• {{ "usersGetPremium" | i18n }}</small>
+          <small *ngIf="selectableProduct.product != productTypes.Free"
+            >• {{ "priorityCustomerSupport" | i18n }}</small
+          >
+          <small *ngIf="selectableProduct.trialPeriodDays && createOrganization"
+            >•
+            {{ "xDayFreeTrial" | i18n : selectableProduct.trialPeriodDays }}
+          </small>
+        </ng-template>
       </ng-template>
       <span *ngIf="selectableProduct.product != productTypes.Free">
         <ng-container *ngIf="selectableProduct.PasswordManager.basePrice && !acceptingSponsorship">