diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs
index f353bd21..0d1c0ade 100644
--- a/EnvelopeGenerator.Web/Controllers/HomeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs
@@ -193,9 +193,9 @@ namespace EnvelopeGenerator.Web.Controllers
                                 {
                                     var res = await _msgService.SendSmsCodeAsync(er_secret.PhoneNumber!, envelopeReceiverId: envelopeReceiverId);
                                     if (res.Ok)
-                                        return View("EnvelopeLocked").WithData("AccessCodeName", "smsCode").WithData("Expiration", res.Expiration);
+                                        return View("EnvelopeLocked").WithData("CodeType", "smsCode").WithData("Expiration", res.Expiration);
                                     else if (!res.Allowed)
-                                        return View("EnvelopeLocked").WithData("AccessCodeName", "smsCode").WithData("Expiration", res.AllowedAt);
+                                        return View("EnvelopeLocked").WithData("CodeType", "smsCode").WithData("Expiration", res.AllowedAt);
                                     else
                                     {
                                         var res_json = JsonConvert.SerializeObject(res);
@@ -205,7 +205,7 @@ namespace EnvelopeGenerator.Web.Controllers
                                 }
                                 else
                                 {
-                                    return View("EnvelopeLocked").WithData("AccessCodeName", "authenticatorCode");
+                                    return View("EnvelopeLocked").WithData("CodeType", "authenticatorCode");
                                 }
                             }
 
@@ -221,13 +221,13 @@ namespace EnvelopeGenerator.Web.Controllers
                                 if (er_secret.AccessCode != auth.AccessCode)
                                 {
                                     //Constants.EnvelopeStatus.AccessCodeIncorrect
-                                    await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, Constants.EnvelopeStatus.AccessCodeIncorrect);
+                                    await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeIncorrect);
                                     Response.StatusCode = StatusCodes.Status401Unauthorized;
                                     return View("EnvelopeLocked")
                                             .WithData("ErrorMessage", _localizer[WebKey.WrongAccessCode].Value);
                                 }
 
-                                await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, Constants.EnvelopeStatus.AccessCodeCorrect);
+                                await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeCorrect);
 
                                 //check if the user has phone is added
                                 if (er_secret.TFAEnabled)
diff --git a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
index cc285a6c..6c870f80 100644
--- a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
@@ -6,10 +6,10 @@
     var logo = _logoOpt.Value;
     ViewData["Title"] = _localizer[WebKey.DocProtected];
     var userCulture = ViewData["UserCulture"] as Culture;
-    string accessCodeName = ViewData["AccessCodeName"] is string _accessCodeName ? _accessCodeName : "accessCode";
-    string codePropName = char.ToUpper(accessCodeName[0]) + accessCodeName.Substring(1);
-    bool viaSms = accessCodeName == "smsCode";
-    bool viaAuthenticator = accessCodeName == "authenticatorCode";
+    string codeType = ViewData["CodeType"] is string _accessCodeName ? _accessCodeName : "accessCode";
+    string codePropName = char.ToUpper(codeType[0]) + codeType.Substring(1);
+    bool viaSms = codeType == "smsCode";
+    bool viaAuthenticator = codeType == "authenticatorCode";
     bool viaTFA = viaSms || viaAuthenticator;
     DateTime? expiration = ViewData["Expiration"] is DateTime _expiration ? _expiration : null;
     bool tfaEnabled = ViewData["TFAEnabled"] is bool _tfaEnabled && _tfaEnabled;
@@ -36,7 +36,7 @@
         <div class="access-code-panel justify-content-center align-items-center p-0 m-0">
             <form id="form-access-code" class="form form-floating mb-0" method="post"> 
                 <div class="form-floating access-code-form-floating">
-                    <input type="password" id="access_code" class="form-control" name="@accessCodeName" placeholder="@_localizer[viaSms ? WebKey.LockedSmsAccessCode : WebKey.LockedAccessCode]" required="required">
+                    <input type="password" id="access_code" class="form-control" name="@codeType" placeholder="@_localizer[viaSms ? WebKey.LockedSmsAccessCode : WebKey.LockedAccessCode]" required="required">
                     <label for="access_code">@_localizer[viaSms ? WebKey.LockedSmsAccessCode : WebKey.LockedAccessCode]</label>
                     <button type="submit" class="btn btn-primary">
                         <span class="material-symbols-outlined">