diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html
index a14ec16cce..2c6347780e 100644
--- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html
+++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html
@@ -102,6 +102,6 @@ <h4 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Orga
 </div>
 <div mat-dialog-actions class="actions">
   <button mat-stroked-button (click)="onClose()">Cancel</button>
-  <button mat-flat-button color="primary" [disabled]="form.invalid" *ngIf="!isEdit" (click)="onCreate()">Add</button>
-  <button mat-flat-button color="primary" [disabled]="form.invalid" *ngIf="isEdit" (click)="onSave()">Save</button>
+  <button mat-flat-button color="primary" *ngIf="!isEdit" (click)="onCreate()">Add</button>
+  <button mat-flat-button color="primary" *ngIf="isEdit" (click)="onSave()">Save</button>
 </div>
diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts
index cfd2303c8e..ceaec693ba 100644
--- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts
+++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts
@@ -98,26 +98,30 @@ export class OwnerDialogComponent {
   }
 
   async onCreate() {
-    if (!this.data.submissionUuid) {
-      console.error('ApplicationOwnerDialogComponent misconfigured, needs fileId for create');
-      return;
+    if (this.form.valid) {
+      if (!this.data.submissionUuid) {
+        console.error('ApplicationOwnerDialogComponent misconfigured, needs fileId for create');
+        return;
+      }
+  
+      const documentUuid = await this.uploadPendingFile(this.pendingFile);
+      const createDto: ApplicationOwnerCreateDto & NoticeOfIntentOwnerCreateDto = {
+        organizationName: this.organizationName.getRawValue() || undefined,
+        firstName: this.firstName.getRawValue() || undefined,
+        lastName: this.lastName.getRawValue() || undefined,
+        corporateSummaryUuid: documentUuid?.uuid,
+        email: this.email.getRawValue()!,
+        phoneNumber: this.phoneNumber.getRawValue()!,
+        typeCode: this.type.getRawValue()!,
+        applicationSubmissionUuid: this.data.submissionUuid,
+        noticeOfIntentSubmissionUuid: this.data.submissionUuid,
+      };
+  
+      const res = await this.data.ownerService.create(createDto);
+      this.dialogRef.close(res);
+    } else {
+      this.form.markAllAsTouched()
     }
-
-    const documentUuid = await this.uploadPendingFile(this.pendingFile);
-    const createDto: ApplicationOwnerCreateDto & NoticeOfIntentOwnerCreateDto = {
-      organizationName: this.organizationName.getRawValue() || undefined,
-      firstName: this.firstName.getRawValue() || undefined,
-      lastName: this.lastName.getRawValue() || undefined,
-      corporateSummaryUuid: documentUuid?.uuid,
-      email: this.email.getRawValue()!,
-      phoneNumber: this.phoneNumber.getRawValue()!,
-      typeCode: this.type.getRawValue()!,
-      applicationSubmissionUuid: this.data.submissionUuid,
-      noticeOfIntentSubmissionUuid: this.data.submissionUuid,
-    };
-
-    const res = await this.data.ownerService.create(createDto);
-    this.dialogRef.close(res);
   }
 
   async onClose() {
@@ -125,19 +129,23 @@ export class OwnerDialogComponent {
   }
 
   async onSave() {
-    const document = await this.uploadPendingFile(this.pendingFile);
-    const updateDto: ApplicationOwnerUpdateDto = {
-      organizationName: this.organizationName.getRawValue(),
-      firstName: this.firstName.getRawValue(),
-      lastName: this.lastName.getRawValue(),
-      corporateSummaryUuid: document?.uuid,
-      email: this.email.getRawValue()!,
-      phoneNumber: this.phoneNumber.getRawValue()!,
-      typeCode: this.type.getRawValue()!,
-    };
-    if (this.existingUuid) {
-      const res = await this.data.ownerService.update(this.existingUuid, updateDto);
-      this.dialogRef.close(res);
+    if (this.form.valid) {
+      const document = await this.uploadPendingFile(this.pendingFile);
+      const updateDto: ApplicationOwnerUpdateDto = {
+        organizationName: this.organizationName.getRawValue(),
+        firstName: this.firstName.getRawValue(),
+        lastName: this.lastName.getRawValue(),
+        corporateSummaryUuid: document?.uuid,
+        email: this.email.getRawValue()!,
+        phoneNumber: this.phoneNumber.getRawValue()!,
+        typeCode: this.type.getRawValue()!,
+      };
+      if (this.existingUuid) {
+        const res = await this.data.ownerService.update(this.existingUuid, updateDto);
+        this.dialogRef.close(res);
+      }
+    } else {
+      this.form.markAllAsTouched()
     }
   }