diff --git a/EnvelopeGenerator.Domain/Entities/EGUser.cs b/EnvelopeGenerator.Domain/Entities/EGUser.cs
index d5494e6c..e38486b0 100644
--- a/EnvelopeGenerator.Domain/Entities/EGUser.cs
+++ b/EnvelopeGenerator.Domain/Entities/EGUser.cs
@@ -1,17 +1,35 @@
 using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel;
 using DigitalData.UserManager.Domain.Entities;
 
-#if NETFRAMEWORK
-using System;
-#endif
-
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBDD_USER", Schema = "dbo")]
     public class EGUser : User
     {
+        public EGUser()
+        {
+        }
+
+        public EGUser(User user)
+        {
+            Id = user.Id;
+            Prename = user.Prename;
+            Name = user.Name;
+            Username = user.Username;
+            Shortname = user.Shortname;
+            Email = user.Email;
+            Language = user.Language;
+            Comment = user.Comment;
+            Deleted = user.Deleted;
+            DateFormat = user.DateFormat;
+            Active = user.Active;
+            GeneralViewer = user.GeneralViewer;
+            WanEnvironment = user.WanEnvironment;
+            UserIdFkIntEcm = user.UserIdFkIntEcm;
+            DeletedWhen = user.DeletedWhen;
+            DeletedWho = user.DeletedWho;
+        }
+
         #region FORM_APP
         [NotMapped]
         public bool HasAccess { get; set; }
diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs
index 4af599cf..815a0c89 100644
--- a/EnvelopeGenerator.Domain/Entities/Envelope.cs
+++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.UserManager.Domain.Entities;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 #if NETFRAMEWORK
 using System;
@@ -113,7 +114,7 @@ namespace EnvelopeGenerator.Domain.Entities
 
         // TODO: * Check the Form App and remove the default value
         [ForeignKey("UserId")]
-        public EGUser User { get; set; } = new EGUser();
+        public User User { get; set; }
 
         [ForeignKey("EnvelopeTypeId")]
         public EnvelopeType EnvelopeType { get; set; }
diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs
index d7d8b6a2..9f651905 100644
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.UserManager.Domain.Entities;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 #if NETFRAMEWORK
 using System;
@@ -38,7 +39,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public string Comment { get; set; }
 
         [ForeignKey("UserReference")]
-        public virtual EGUser Sender { get; set; }
+        public virtual User Sender { get; set; }
 
         [ForeignKey("UserReference")]
         public virtual Receiver Receiver { get; set; }