diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs
index ee359a13..6c744dd3 100644
--- a/EnvelopeGenerator.Web/Controllers/HomeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs
@@ -114,24 +114,27 @@ public class HomeController : ViewControllerBase
     {
         try
         {
-            return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelopeReceiverId).ThenAsync(
-            SuccessAsync: async er => {
-                if (User.IsInRole(ReceiverRole.FullyAuth))
-                    return await CreateShowEnvelopeView(envelopeReceiverId, er);
-                else
-                    return View()
-                    .WithData("EnvelopeKey", envelopeReceiverId)
-                    .WithData("TFAEnabled", er.Envelope!.TFAEnabled)
-                    .WithData("HasPhoneNumber", er.HasPhoneNumber)
-                    .WithData("SenderEmail", er.Envelope.User!.Email)
-                    .WithData("EnvelopeTitle", er.Envelope.Title);
-                },
-            Fail: IActionResult (messages, notices) =>
+            var envRcv = await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelopeReceiverId);
+            if (envRcv.IsFailed)
             {
-                _logger.LogNotice(notices);
+                _logger.LogNotice(envRcv.Notices);
                 Response.StatusCode = StatusCodes.Status401Unauthorized;
                 return this.ViewEnvelopeNotFound();
-            });
+            }
+
+            var er = envRcv.Data;
+
+            if (User.IsInRole(ReceiverRole.FullyAuth))
+                return await CreateShowEnvelopeView(envelopeReceiverId, er);
+            else
+            {
+                ViewData["EnvelopeKey"] = envelopeReceiverId;
+                ViewData["TFAEnabled"] = er.Envelope!.TFAEnabled;
+                ViewData["HasPhoneNumber"] = er.HasPhoneNumber;
+                ViewData["SenderEmail"] = er.Envelope.User!.Email;
+                ViewData["EnvelopeTitle"] = er.Envelope.Title;
+                return View();
+            }
         }
         catch(Exception ex)
         {