diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs
index 1779c6ec..f6128743 100644
--- a/EnvelopeGenerator.Web/Controllers/HomeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs
@@ -162,6 +162,12 @@ public class HomeController : ViewControllerBase
         {
             var (smsRes, expiration) = await _envSmsHandler.SendTotpAsync(er_secret);
 
+            ViewData["EnvelopeKey"] = envelopeReceiverId;
+            ViewData["TFAEnabled"] = er_secret.Envelope!.TFAEnabled;
+            ViewData["HasPhoneNumber"] = er_secret.HasPhoneNumber;
+            ViewData["SenderEmail"] = er_secret.Envelope.User!.Email;
+            ViewData["EnvelopeTitle"] = er_secret.Envelope.Title;
+
             if (smsRes?.Failed ?? false)
             {
                 var res_json = JsonConvert.SerializeObject(smsRes);
@@ -189,6 +195,11 @@ public class HomeController : ViewControllerBase
             await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeIncorrect);
             Response.StatusCode = StatusCodes.Status401Unauthorized;
             return View("EnvelopeLocked")
+                    .WithData("EnvelopeKey", envelopeReceiverId)
+                    .WithData("TFAEnabled", er_secret.Envelope!.TFAEnabled)
+                    .WithData("HasPhoneNumber", er_secret.HasPhoneNumber)
+                    .WithData("SenderEmail", er_secret.Envelope.User!.Email)
+                    .WithData("EnvelopeTitle", er_secret.Envelope.Title)
                     .WithData("ErrorMessage", _localizer[WebKey.WrongAccessCode].Value);
         }
 
@@ -278,9 +289,7 @@ public class HomeController : ViewControllerBase
 
             if (auth.HasMulti)
             {
-                Response.StatusCode = StatusCodes.Status401Unauthorized;
-                return View("EnvelopeLocked")
-                        .WithData("ErrorMessage", _localizer[WebKey.WrongAccessCode].Value);
+                return Unauthorized();
             }
             else if (auth.HasAccessCode)
             {
@@ -301,6 +310,11 @@ public class HomeController : ViewControllerBase
             {
                 Response.StatusCode = StatusCodes.Status401Unauthorized;
                 return View("EnvelopeLocked")
+                        .WithData("EnvelopeKey", envelopeReceiverId)
+                        .WithData("TFAEnabled", er_secret.Envelope!.TFAEnabled)
+                        .WithData("HasPhoneNumber", er_secret.HasPhoneNumber)
+                        .WithData("SenderEmail", er_secret.Envelope.User!.Email)
+                        .WithData("EnvelopeTitle", er_secret.Envelope.Title)
                         .WithData("ErrorMessage", _localizer[WebKey.WrongAccessCode].Value);
             }