diff --git a/common/ASC.Core.Common/EF/Model/User/DbGroup.cs b/common/ASC.Core.Common/EF/Model/User/DbGroup.cs
index 4517eafe9e..911008cc56 100644
--- a/common/ASC.Core.Common/EF/Model/User/DbGroup.cs
+++ b/common/ASC.Core.Common/EF/Model/User/DbGroup.cs
@@ -1,6 +1,6 @@
 namespace ASC.Core.Common.EF
 {
-    public class DbGroup : BaseEntity
+    public class DbGroup : BaseEntity, IMapFrom<Group>
     {
         public int Tenant { get; set; }
         public Guid Id { get; set; }
diff --git a/common/ASC.Core.Common/EF/Model/User/User.cs b/common/ASC.Core.Common/EF/Model/User/User.cs
index 2b42d6c268..2693f7a93a 100644
--- a/common/ASC.Core.Common/EF/Model/User/User.cs
+++ b/common/ASC.Core.Common/EF/Model/User/User.cs
@@ -1,6 +1,6 @@
 namespace ASC.Core.Common.EF
 {
-    public class User : BaseEntity
+    public class User : BaseEntity, IMapFrom<UserInfo>
     {
         public int Tenant { get; set; }
         public string UserName { get; set; }
@@ -38,7 +38,6 @@
 
     public static class DbUserExtension
     {
-
         public static ModelBuilderWrapper AddUser(this ModelBuilderWrapper modelBuilder)
         {
             modelBuilder