diff --git a/apps/web/src/app/billing/organizations/adjust-subscription.component.html b/apps/web/src/app/billing/organizations/adjust-subscription.component.html
index f7a6f616dbd..148d507a6a8 100644
--- a/apps/web/src/app/billing/organizations/adjust-subscription.component.html
+++ b/apps/web/src/app/billing/organizations/adjust-subscription.component.html
@@ -1,7 +1,7 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
   <div>
     <div class="row">
-      <div class="form-group col-6">
+      <div class="form-group col-8">
         <label for="newSeatCount">{{ "subscriptionSeats" | i18n }}</label>
         <input
           id="newSeatCount"
@@ -41,7 +41,7 @@
         <label for="maxAutoscaleSeats">{{ "maxSeatLimit" | i18n }}</label>
         <input
           id="maxAutoscaleSeats"
-          class="form-control col-6"
+          class="form-control col-8"
           type="number"
           name="MaxAutoscaleSeats"
           [(ngModel)]="newMaxSeats"
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
index ed0af06e6ab..2e320ce95d5 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -116,14 +116,15 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
     this.showSecretsManagerSubscribe =
       this.userOrg.canEditSubscription &&
       !this.userOrg.useSecretsManager &&
+      this.subscription != null &&
       !this.subscription.cancelled &&
       !this.subscriptionMarkedForCancel;
 
     this.showAdjustSecretsManager =
       this.userOrg.canEditSubscription &&
       this.userOrg.useSecretsManager &&
-      this.sub.secretsManagerPlan != null &&
-      this.sub.secretsManagerPlan.hasAdditionalSeatsOption &&
+      this.subscription != null &&
+      this.sub.secretsManagerPlan?.hasAdditionalSeatsOption &&
       !this.subscription.cancelled &&
       !this.subscriptionMarkedForCancel;
 
diff --git a/libs/common/src/billing/models/response/plan.response.ts b/libs/common/src/billing/models/response/plan.response.ts
index c3558a1b534..bb09a9b143c 100644
--- a/libs/common/src/billing/models/response/plan.response.ts
+++ b/libs/common/src/billing/models/response/plan.response.ts
@@ -55,6 +55,8 @@ export class PlanResponse extends BaseResponse {
   maxServiceAccount: number;
   hasAdditionalServiceAccountOption: boolean;
   maxProjects: number;
+  maxAdditionalServiceAccounts: number;
+  stripeServiceAccountPlanId: string;
 
   constructor(response: any) {
     super(response);
@@ -109,5 +111,7 @@ export class PlanResponse extends BaseResponse {
       "HasAdditionalServiceAccountOption"
     );
     this.maxProjects = this.getResponseProperty("MaxProjects");
+    this.maxAdditionalServiceAccounts = this.getResponseProperty("MaxAdditionalServiceAccounts");
+    this.stripeServiceAccountPlanId = this.getResponseProperty("StripeServiceAccountPlanId");
   }
 }