diff --git a/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs b/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs
index 02db9593..e0bbe042 100644
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs
@@ -51,7 +51,9 @@ namespace EnvelopeGenerator.Application.DTOs
 
 		public int? ExpiresWarningWhenDays { get; set; }
 
-		public bool DmzMoved { get; set; }
+        public bool TFAEnabled { get; init; }
+
+        public bool DmzMoved { get; set; }
 		public UserReadDto? User { get; set; }
 		public EnvelopeType? EnvelopeType { get; set; }
 
diff --git a/EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverBasicDto.cs b/EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverBasicDto.cs
index 1302f14f..64c5b869 100644
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverBasicDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverBasicDto.cs
@@ -27,7 +27,5 @@ namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
         public DateTime? ChangedWhen { get; init; }
 
         public bool HasPhoneNumber { get; init; }
-
-        public bool TFAEnabled { get; init; }
     }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs
index c422a430..e4db872e 100644
--- a/EnvelopeGenerator.Domain/Entities/Envelope.cs
+++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs
@@ -84,6 +84,9 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("EXPIRES_WARNING_WHEN_DAYS")]
         public int? ExpiresWarningWhenDays { get; set; }
 
+        [Column("TFA_ENABLED", TypeName = "bit")]
+        public bool TFAEnabled { get; set; }
+
         /// <summary>
         /// The sender of envelope
         /// </summary>
diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs
index 64bc6802..bbf55d2b 100644
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs
@@ -45,10 +45,7 @@ namespace EnvelopeGenerator.Domain.Entities
         [StringLength(20)]
         [RegularExpression(@"^\+[0-9]+$", ErrorMessage = "Phone number must start with '+' followed by digits.")]
         public string? PhoneNumber { get; set; }
-
-        [Column("TFA_ENABLED", TypeName = "bit")]
-        public bool TFAEnabled { get; set; }
-
+        
         [NotMapped]
         public (int Envelope, int Receiver) Id => (Envelope: EnvelopeId, Receiver: ReceiverId);
 
diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs
index d67d9b86..51af9827 100644
--- a/EnvelopeGenerator.Web/Controllers/HomeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs
@@ -146,7 +146,7 @@ namespace EnvelopeGenerator.Web.Controllers
                 return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelopeReceiverId).ThenAsync(
                     Success: er => View()
                         .WithData("EnvelopeKey", envelopeReceiverId)
-                        .WithData("TFAEnabled", er.TFAEnabled)
+                        .WithData("TFAEnabled", er.Envelope!.TFAEnabled)
                         .WithData("HasPhoneNumber", er.HasPhoneNumber),
                     Fail: IActionResult (messages, notices) =>
                     {
@@ -229,7 +229,7 @@ namespace EnvelopeGenerator.Web.Controllers
                                 await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeCorrect);
 
                                 //check if the user has phone is added
-                                if (er_secret.TFAEnabled)
+                                if (er_secret.Envelope!.TFAEnabled)
                                 {
                                     var rcv = er_secret.Receiver;
                                     if (rcv.IsTotpSecretInvalid())