diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index abc3aa3a1d7..36143682fa2 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -9969,5 +9969,8 @@
   },
   "domainClaimed": {
     "message": "Domain claimed"
+  },
+  "organizationNameMaxLength": {
+    "message": "Organization name cannot exceed 50 characters."
   }
 }
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html b/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html
index a08f5710f1e..78f2cb41bef 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html
@@ -43,6 +43,14 @@
             {{ "organizationName" | i18n }}
           </bit-label>
           <input type="text" bitInput formControlName="organizationName" />
+          <bit-error-summary
+            *ngIf="
+              formGroup.get('organizationName').errors?.['maxLength'] &&
+              formGroup.get('organizationName').touched
+            "
+          >
+            {{ "organizationNameMaxLength" | i18n }}
+          </bit-error-summary>
         </bit-form-field>
         <bit-form-field>
           <bit-label>
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts
index 18910491a0c..2a27b1b32f3 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts
@@ -47,7 +47,7 @@ export class CreateClientDialogComponent implements OnInit {
   protected discountPercentage: number;
   protected formGroup = new FormGroup({
     clientOwnerEmail: new FormControl<string>("", [Validators.required, Validators.email]),
-    organizationName: new FormControl<string>("", [Validators.required]),
+    organizationName: new FormControl<string>("", [Validators.required, Validators.maxLength(50)]),
     seats: new FormControl<number>(null, [Validators.required, Validators.min(1)]),
   });
   protected loading = true;