diff --git a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts
index a1086a24a2..8629433e02 100644
--- a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts
+++ b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts
@@ -1,6 +1,6 @@
 import {Component, Inject} from '@angular/core';
-import {FORM_PROP_DATA_STREAM, FormProp} from "@abp/ng.theme.shared/extensions";
-import {ControlContainer, FormGroup, FormGroupDirective} from "@angular/forms";
+import {FORM_PROP_DATA_STREAM, FormProp, EXTENSIBLE_FORM_VIEW_PROVIDER} from "@abp/ng.theme.shared/extensions";
+import {FormGroup} from "@angular/forms";
 
 @Component({
   selector: 'abp-personal-settings-half-row',
@@ -15,8 +15,7 @@ import {ControlContainer, FormGroup, FormGroupDirective} from "@angular/forms";
       </div>
     </div>`,
   styles: [],
-  viewProviders: [{ provide: ControlContainer, useExisting: FormGroupDirective }]
-
+  viewProviders: [EXTENSIBLE_FORM_VIEW_PROVIDER]
 })
 export class PersonalSettingsHalfRowComponent {
   public displayName: string;
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts
index 83d17b9f0b..2086e3c818 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts
@@ -64,4 +64,3 @@ export class ExtensibleFormComponent<R = any> {
 }
 
 
-export const ExtensibleFormViewProvider = { provide: ControlContainer, useExisting: FormGroupDirective }
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensible-form-view-provider.token.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensible-form-view-provider.token.ts
new file mode 100644
index 0000000000..9db2949731
--- /dev/null
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensible-form-view-provider.token.ts
@@ -0,0 +1,3 @@
+import { ControlContainer, FormGroupDirective } from "@angular/forms";
+
+export const EXTENSIBLE_FORM_VIEW_PROVIDER = { provide: ControlContainer, useExisting: FormGroupDirective }
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts b/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts
index b19f8eb0d9..f786eb4ac8 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts
@@ -64,6 +64,7 @@ export {
 export * from './lib/pipes/create-injector.pipe';
 export * from './lib/services/extensions.service';
 export * from './lib/tokens/extensions.token';
+export * from './lib/tokens/extensible-form-view-provider.token';
 export * from './lib/ui-extensions.module';
 export * from './lib/utils/actions.util';
 export * from './lib/utils/form-props.util';