diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts
index daaa183c0c..e8b6edc5c2 100644
--- a/models/contact/src/index.ts
+++ b/models/contact/src/index.ts
@@ -164,6 +164,10 @@ export function createModel (builder: Builder): void {
     editor: contact.component.EditPerson
   })
 
+  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.ObjectEditor, {
+    editor: contact.component.EditPerson
+  })
+
   builder.mixin(contact.class.Organization, core.class.Class, view.mixin.ObjectEditor, {
     editor: contact.component.EditOrganization
   })
diff --git a/plugins/contact-resources/src/components/PersonPresenter.svelte b/plugins/contact-resources/src/components/PersonPresenter.svelte
index 1ca02fb20c..e32d26ff3d 100644
--- a/plugins/contact-resources/src/components/PersonPresenter.svelte
+++ b/plugins/contact-resources/src/components/PersonPresenter.svelte
@@ -15,15 +15,20 @@
 -->
 <script lang="ts">
   import { formatName, Person } from '@anticrm/contact'
-  import { Avatar } from '@anticrm/presentation'
-  import { closeTooltip, showPopup } from '@anticrm/ui'
-  import EditPerson from './EditPerson.svelte'
+  import { getResource } from '@anticrm/platform'
+  import { Avatar, getClient } from '@anticrm/presentation'
+  import { showPopup } from '@anticrm/ui'
+  import view from '@anticrm/view'
 
   export let value: Person
 
   async function onClick () {
-    closeTooltip()
-    showPopup(EditPerson, { _id: value._id }, 'full')
+    const client = getClient()
+    const hierarchy = client.getHierarchy()
+    const clazz = hierarchy.getClass(value._class)
+    const editorMixin = hierarchy.as(clazz, view.mixin.ObjectEditor)
+    const editor = await getResource(editorMixin.editor) 
+    showPopup(editor, { _id: value._id }, 'full')
   }
 </script>