diff --git a/npm/ng-packs/packages/account/src/lib/components/hello/hello.component.ts b/npm/ng-packs/packages/account/src/lib/components/hello/hello.component.ts
deleted file mode 100644
index 2fc59314aa..0000000000
--- a/npm/ng-packs/packages/account/src/lib/components/hello/hello.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {Component, Inject } from '@angular/core';
-import {FORM_PROP_DATA_STREAM, FormProp} from "@abp/ng.theme.shared/extensions";
-
-@Component({
-  selector: 'abp-hello',
-  template: `<p>hello works! {{name | abpLocalization}}</p>`,
-  styles: [],
-})
-export class HelloComponent  {
-  name:string;
-  constructor(@Inject(FORM_PROP_DATA_STREAM) private propData:FormProp) {
-    this.name = propData.displayName
-  }
-
-}
diff --git a/npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts b/npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts
index 0e9e06f020..325c25010f 100644
--- a/npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts
+++ b/npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts
@@ -1,7 +1,7 @@
 import {ePropType, FormProp} from "@abp/ng.theme.shared/extensions";
 import {UpdateProfileDto} from "@abp/ng.account.core/proxy";
 import {Validators} from "@angular/forms";
- import {PersonalSettingsHalfRowComponent} from "../components/personal-settings/personal-settings-half-row.component";
+import {PersonalSettingsHalfRowComponent} from "../components/personal-settings/personal-settings-half-row.component";
 
 const { maxLength, required, email } = Validators;
 export const DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS = FormProp.createMany<UpdateProfileDto>([
diff --git a/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts b/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts
index 20c4269977..48fe8a341f 100644
--- a/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts
+++ b/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts
@@ -23,11 +23,11 @@ export class AccountExtensionsGuard implements CanActivate {
       this.injector.get(ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, null) || {};
 
     const configState = this.injector.get(ConfigStateService);
-    return getObjectExtensionEntitiesFromStore(configState, 'Account').pipe(
+    return getObjectExtensionEntitiesFromStore(configState, 'Identity').pipe(
       map(entities => ({
-        [eAccountComponents.PersonalSettings]: entities.PersonalSettings,
+        [eAccountComponents.PersonalSettings]: entities.User,
        })),
-      mapEntitiesToContributors(configState, 'AbpAccount'),
+      mapEntitiesToContributors(configState, 'AbpIdentity'),
       tap(objectExtensionContributors => {
         mergeWithDefaultProps(
           extensions.editFormProps,
diff --git a/npm/ng-packs/packages/account/src/lib/models/config-options.ts b/npm/ng-packs/packages/account/src/lib/models/config-options.ts
index f2e603ab32..c3bbb6cb1b 100644
--- a/npm/ng-packs/packages/account/src/lib/models/config-options.ts
+++ b/npm/ng-packs/packages/account/src/lib/models/config-options.ts
@@ -4,11 +4,8 @@ import {UpdateProfileDto} from "@abp/ng.account.core/proxy";
 
 export interface AccountConfigOptions {
   redirectUrl?: string;
+  editFormPropContributors?: AccountEditFormPropContributors;
 }
 export type AccountEditFormPropContributors = Partial<{
   [eAccountComponents.PersonalSettings]:  EditFormPropContributorCallback<UpdateProfileDto>[];
 }>;
-
-export interface AccountConfigOptions {
-  editFormPropContributors?: AccountEditFormPropContributors;
-}