diff --git a/apps/web/src/app/modules/organizations/create/organization-information.component.html b/apps/web/src/app/modules/organizations/create/organization-information.component.html
index 7550bfbf4c..6029cfd833 100644
--- a/apps/web/src/app/modules/organizations/create/organization-information.component.html
+++ b/apps/web/src/app/modules/organizations/create/organization-information.component.html
@@ -6,7 +6,7 @@
 </form>
 <form #form [formGroup]="formGroup" *ngIf="!nameOnly">
   <h2>{{ "generalInformation" | i18n }}</h2>
-  <div class="tw-flex tw-w-full tw-space-x-4">
+  <div class="tw-flex tw-w-full tw-space-x-4" *ngIf="createOrganization">
     <bit-form-field class="tw-w-1/2">
       <bit-label>{{ "organizationName" | i18n }}</bit-label>
       <input bitInput type="text" formControlName="name" />
@@ -15,18 +15,24 @@
       <bit-label>{{ "billingEmail" | i18n }}</bit-label>
       <input bitInput type="email" formControlName="billingEmail" />
     </bit-form-field>
-  </div>
-  <input
-    type="checkbox"
-    name="businessOwned"
-    formControlName="businessOwned"
-    (change)="changedBusinessOwned.emit()"
-  />
-  <bit-label for="businessOwned" class="tw-mb-3">{{ "accountOwnedBusiness" | i18n }}</bit-label>
-  <div class="tw-mt-4" *ngIf="formGroup.controls['businessOwned'].value">
-    <bit-form-field class="tw-w-1/2">
-      <bit-label>{{ "businessName" | i18n }}</bit-label>
-      <input bitInput type="text" formControlName="businessName" />
+    <bit-form-field class="tw-w-1/2" *ngIf="isProvider">
+      <bit-label>{{ "clientOwnerEmail" | i18n }}</bit-label>
+      <input bitInput type="email" formControlName="clientOwnerEmail" />
     </bit-form-field>
   </div>
+  <div *ngIf="!isProvider && !acceptingSponsorship">
+    <input
+      type="checkbox"
+      name="businessOwned"
+      formControlName="businessOwned"
+      (change)="changedBusinessOwned.emit()"
+    />
+    <bit-label for="businessOwned" class="tw-mb-3">{{ "accountOwnedBusiness" | i18n }}</bit-label>
+    <div class="tw-mt-4" *ngIf="formGroup.controls['businessOwned'].value">
+      <bit-form-field class="tw-w-1/2">
+        <bit-label>{{ "businessName" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="businessName" />
+      </bit-form-field>
+    </div>
+  </div>
 </form>
diff --git a/apps/web/src/app/modules/organizations/create/organization-information.component.ts b/apps/web/src/app/modules/organizations/create/organization-information.component.ts
index 5d35f6df8a..bd59a472ed 100644
--- a/apps/web/src/app/modules/organizations/create/organization-information.component.ts
+++ b/apps/web/src/app/modules/organizations/create/organization-information.component.ts
@@ -7,6 +7,9 @@ import { FormGroup } from "@angular/forms";
 })
 export class OrganizationInformationComponent {
   @Input() nameOnly = false;
+  @Input() createOrganization = true;
+  @Input() isProvider = false;
+  @Input() acceptingSponsorship = false;
   @Input() formGroup: FormGroup;
   @Output() changedBusinessOwned = new EventEmitter<void>();
 }
diff --git a/apps/web/src/app/settings/organization-plans.component.html b/apps/web/src/app/settings/organization-plans.component.html
index 4fe4c3263e..827554ea53 100644
--- a/apps/web/src/app/settings/organization-plans.component.html
+++ b/apps/web/src/app/settings/organization-plans.component.html
@@ -34,6 +34,9 @@
   <app-org-info
     (changedBusinessOwned)="changedOwnedBusiness()"
     [formGroup]="formGroup"
+    [createOrganization]="createOrganization"
+    [isProvider]="!!providerId"
+    [acceptingSponsorship]="acceptingSponsorship"
   ></app-org-info>
   <h2 class="mt-5">{{ "chooseYourPlan" | i18n }}</h2>
   <div *ngFor="let selectableProduct of selectableProducts" class="form-check form-check-block">
diff --git a/apps/web/src/app/settings/organization-plans.component.ts b/apps/web/src/app/settings/organization-plans.component.ts
index 72086a4d42..c894e3a2da 100644
--- a/apps/web/src/app/settings/organization-plans.component.ts
+++ b/apps/web/src/app/settings/organization-plans.component.ts
@@ -58,7 +58,7 @@ export class OrganizationPlansComponent implements OnInit {
     premiumAccessAddon: [false],
     additionalStorage: [0, [Validators.min(0), Validators.max(99)]],
     additionalSeats: [0, [Validators.min(0), Validators.max(100000)]],
-    clientOwnerEmail: [""],
+    clientOwnerEmail: ["", [Validators.email]],
     businessName: [""],
     plan: [this.plan],
     product: [this.product],
@@ -96,6 +96,11 @@ export class OrganizationPlansComponent implements OnInit {
       this.changedOwnedBusiness();
     }
 
+    if (!this.createOrganization) {
+      this.formGroup.controls.product.setValue(ProductType.Families);
+      this.changedProduct();
+    }
+
     this.loading = false;
   }