diff --git a/npm/ng-packs/packages/cms-kit/admin/src/components/blog-posts/blog-post-form/blog-post-form.component.html b/npm/ng-packs/packages/cms-kit/admin/src/components/blog-posts/blog-post-form/blog-post-form.component.html
index 2f8a80d721..8d2138f906 100644
--- a/npm/ng-packs/packages/cms-kit/admin/src/components/blog-posts/blog-post-form/blog-post-form.component.html
+++ b/npm/ng-packs/packages/cms-kit/admin/src/components/blog-posts/blog-post-form/blog-post-form.component.html
@@ -2,7 +2,7 @@
   <div class="card">
     <div class="card-body">
       @if (form && (!isEditMode || blogPost)) {
-        <form [formGroup]="form" (ngSubmit)="saveAsDraft()" validateOnSubmit>
+        <form [formGroup]="form" (ngSubmit)="saveAsDraft()" [validateOnSubmit]="true">
           <!-- Cover Image -->
           <div class="mb-3">
             @if (coverImagePreview) {
diff --git a/npm/ng-packs/packages/cms-kit/admin/src/components/blogs/blog-features-modal/blog-features-modal.component.html b/npm/ng-packs/packages/cms-kit/admin/src/components/blogs/blog-features-modal/blog-features-modal.component.html
index da9240ac8c..77ccd60396 100644
--- a/npm/ng-packs/packages/cms-kit/admin/src/components/blogs/blog-features-modal/blog-features-modal.component.html
+++ b/npm/ng-packs/packages/cms-kit/admin/src/components/blogs/blog-features-modal/blog-features-modal.component.html
@@ -5,7 +5,7 @@
 
   <ng-template #abpBody>
     @if (form) {
-      <form [formGroup]="form" (ngSubmit)="save()" validateOnSubmit>
+      <form [formGroup]="form" (ngSubmit)="save()" [validateOnSubmit]="true">
         <div formArrayName="features">
           @for (featureControl of featuresFormArray.controls; track $index; let i = $index) {
             <div class="mb-3" [formGroupName]="i">
@@ -33,7 +33,7 @@
                       class="form-check-input"
                       id="feature-{{ i }}"
                       formControlName="isEnabled"
-                      disabled
+                      [disabled]="true"
                     />
                     <label class="form-check-label" for="feature-{{ i }}">
                       {{ 'CmsKit::' + features[i]?.featureName | abpLocalization }}
diff --git a/npm/ng-packs/packages/cms-kit/admin/src/components/blogs/blog-modal/blog-modal.component.html b/npm/ng-packs/packages/cms-kit/admin/src/components/blogs/blog-modal/blog-modal.component.html
index 83d235bcd3..b6a7fe9412 100644
--- a/npm/ng-packs/packages/cms-kit/admin/src/components/blogs/blog-modal/blog-modal.component.html
+++ b/npm/ng-packs/packages/cms-kit/admin/src/components/blogs/blog-modal/blog-modal.component.html
@@ -7,7 +7,7 @@
 
   <ng-template #abpBody>
     @if (form) {
-      <form [formGroup]="form" (ngSubmit)="save()" validateOnSubmit>
+      <form [formGroup]="form" (ngSubmit)="save()" [validateOnSubmit]="true">
         <abp-extensible-form [selectedRecord]="selected()" />
       </form>
     } @else {
diff --git a/npm/ng-packs/packages/cms-kit/admin/src/components/cms-settings/cms-settings.component.ts b/npm/ng-packs/packages/cms-kit/admin/src/components/cms-settings/cms-settings.component.ts
index 34bf59385e..0e12a005d0 100644
--- a/npm/ng-packs/packages/cms-kit/admin/src/components/cms-settings/cms-settings.component.ts
+++ b/npm/ng-packs/packages/cms-kit/admin/src/components/cms-settings/cms-settings.component.ts
@@ -38,6 +38,8 @@ export class CmsSettingsComponent {
   readonly configState = inject(ConfigStateService);
   readonly toaster = inject(ToasterService);
 
+  loading = false;
+
   commentApprovalControl = new FormControl(false);
 
   ngOnInit() {
@@ -47,10 +49,12 @@ export class CmsSettingsComponent {
   }
 
   submit() {
+    this.loading = true;
     this.commentAdminService
       .updateSettings({ commentRequireApprovement: this.commentApprovalControl.value })
       .pipe(
         finalize(() => {
+          this.loading = false;
           this.configState.refreshAppState().subscribe();
         }),
       )
diff --git a/npm/ng-packs/packages/cms-kit/admin/src/components/global-resources/global-resources.component.html b/npm/ng-packs/packages/cms-kit/admin/src/components/global-resources/global-resources.component.html
index 407c83dc26..969bbbe6a8 100644
--- a/npm/ng-packs/packages/cms-kit/admin/src/components/global-resources/global-resources.component.html
+++ b/npm/ng-packs/packages/cms-kit/admin/src/components/global-resources/global-resources.component.html
@@ -1,5 +1,5 @@
 <abp-page [title]="'CmsKit::GlobalResources' | abpLocalization">
-  <form [formGroup]="form" (ngSubmit)="save()" validateOnSubmit>
+  <form [formGroup]="form" (ngSubmit)="save()" [validateOnSubmit]="true">
     <div class="card">
       <div class="card-body">
         <ul
diff --git a/npm/ng-packs/packages/cms-kit/admin/src/components/menus/menu-item-modal/menu-item-modal.component.html b/npm/ng-packs/packages/cms-kit/admin/src/components/menus/menu-item-modal/menu-item-modal.component.html
index 4802a4e570..ced5bf88fa 100644
--- a/npm/ng-packs/packages/cms-kit/admin/src/components/menus/menu-item-modal/menu-item-modal.component.html
+++ b/npm/ng-packs/packages/cms-kit/admin/src/components/menus/menu-item-modal/menu-item-modal.component.html
@@ -11,7 +11,7 @@
 
   <ng-template #abpBody>
     @if (form) {
-      <form [formGroup]="form" (ngSubmit)="save()" validateOnSubmit>
+      <form [formGroup]="form" (ngSubmit)="save()" [validateOnSubmit]="true">
         <ul
           ngbNav
           #nav="ngbNav"
diff --git a/npm/ng-packs/packages/cms-kit/admin/src/components/pages/page-form/page-form.component.html b/npm/ng-packs/packages/cms-kit/admin/src/components/pages/page-form/page-form.component.html
index 0dc5c4a296..d3fd3db178 100644
--- a/npm/ng-packs/packages/cms-kit/admin/src/components/pages/page-form/page-form.component.html
+++ b/npm/ng-packs/packages/cms-kit/admin/src/components/pages/page-form/page-form.component.html
@@ -2,7 +2,7 @@
   <div class="card">
     <div class="card-body">
       @if (form && (!isEditMode || page)) {
-        <form [formGroup]="form" (ngSubmit)="save()" validateOnSubmit>
+        <form [formGroup]="form" (ngSubmit)="save()" [validateOnSubmit]="true">
           <!-- Basic fields outside tabs -->
           <abp-extensible-form [selectedRecord]="page || {}" />
 
diff --git a/npm/ng-packs/packages/cms-kit/admin/src/components/tags/tag-modal/tag-modal.component.html b/npm/ng-packs/packages/cms-kit/admin/src/components/tags/tag-modal/tag-modal.component.html
index cb9d4d1e91..c1e8a9edfa 100644
--- a/npm/ng-packs/packages/cms-kit/admin/src/components/tags/tag-modal/tag-modal.component.html
+++ b/npm/ng-packs/packages/cms-kit/admin/src/components/tags/tag-modal/tag-modal.component.html
@@ -7,7 +7,7 @@
 
   <ng-template #abpBody>
     @if (form) {
-      <form [formGroup]="form" (ngSubmit)="save()" validateOnSubmit>
+      <form [formGroup]="form" (ngSubmit)="save()" [validateOnSubmit]="true">
         <abp-extensible-form [selectedRecord]="selected()" />
       </form>
     } @else {
diff --git a/npm/ng-packs/packages/cms-kit/admin/src/tests/blog-post-form.service.spec.ts b/npm/ng-packs/packages/cms-kit/admin/src/tests/blog-post-form.service.spec.ts
index de63cc346d..bedacb5922 100644
--- a/npm/ng-packs/packages/cms-kit/admin/src/tests/blog-post-form.service.spec.ts
+++ b/npm/ng-packs/packages/cms-kit/admin/src/tests/blog-post-form.service.spec.ts
@@ -58,7 +58,7 @@ describe('BlogPostFormService', () => {
   it('should throw when creating with invalid form', () => {
     const form = createInvalidForm();
 
-    expect(() => service.create(form)).toThrowError('Form is invalid');
+    expect(() => service.create(form)).toThrow('Form is invalid');
   });
 
   it('should call BlogPostAdminService.create and navigate on create', done => {
@@ -114,12 +114,12 @@ describe('BlogPostFormService', () => {
   it('should throw when updating with invalid form or missing blog post', () => {
     const form = createInvalidForm();
 
-    expect(() => service.update('id', form, {} as any)).toThrowError(
+    expect(() => service.update('id', form, {} as any)).toThrow(
       'Form is invalid or blog post is missing',
     );
 
     const validForm = createValidForm();
-    expect(() => service.update('id', validForm, null as any)).toThrowError(
+    expect(() => service.update('id', validForm, null as any)).toThrow(
       'Form is invalid or blog post is missing',
     );
   });
diff --git a/npm/ng-packs/packages/cms-kit/admin/src/tests/page-form.service.spec.ts b/npm/ng-packs/packages/cms-kit/admin/src/tests/page-form.service.spec.ts
index e49a5ea839..50caf2d214 100644
--- a/npm/ng-packs/packages/cms-kit/admin/src/tests/page-form.service.spec.ts
+++ b/npm/ng-packs/packages/cms-kit/admin/src/tests/page-form.service.spec.ts
@@ -59,7 +59,7 @@ describe('PageFormService', () => {
   it('should throw when creating with invalid form', () => {
     const form = createInvalidForm();
 
-    expect(() => service.create(form)).toThrowError('Form is invalid');
+    expect(() => service.create(form)).toThrow('Form is invalid');
   });
 
   it('should call PageAdminService.create and navigate on create', done => {
@@ -103,12 +103,12 @@ describe('PageFormService', () => {
   it('should throw when updating with invalid form or missing page', () => {
     const form = createInvalidForm();
 
-    expect(() => service.update('id', form, {} as any)).toThrowError(
+    expect(() => service.update('id', form, {} as any)).toThrow(
       'Form is invalid or page is missing',
     );
 
     const validForm = createValidForm();
-    expect(() => service.update('id', validForm, null as any)).toThrowError(
+    expect(() => service.update('id', validForm, null as any)).toThrow(
       'Form is invalid or page is missing',
     );
   });