diff --git a/EnvelopeGenerator.Web/Controllers/DocumentController.cs b/EnvelopeGenerator.Web/Controllers/DocumentController.cs
index 6da7f1c9..25a77d8a 100644
--- a/EnvelopeGenerator.Web/Controllers/DocumentController.cs
+++ b/EnvelopeGenerator.Web/Controllers/DocumentController.cs
@@ -22,8 +22,6 @@ namespace EnvelopeGenerator.Web.Controllers
         }
 
         [NonAction]
-        [HttpGet]
-        [Route("api/document/{envelopeKey}")]
         public async Task<IActionResult> Get([FromRoute] string envelopeKey, [FromQuery] int index)
         {
             try
@@ -47,8 +45,8 @@ namespace EnvelopeGenerator.Web.Controllers
             }
         }
 
-        [HttpPost]
-        [Route("api/document/{envelopeKey}")]
+        [Authorize]
+        [HttpPost("api/document/{envelopeKey}")]
         public async Task<IActionResult> Open(string envelopeKey)
         {
             try
diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
index e9eb97c5..e4e69167 100644
--- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
@@ -22,7 +22,6 @@ namespace EnvelopeGenerator.Web.Controllers
         }
 
         [NonAction]
-        [HttpGet("api/envelope/{envelopeKey}")]
         public async Task<IActionResult> Get([FromRoute] string envelopeKey)
         {
             try
@@ -48,6 +47,7 @@ namespace EnvelopeGenerator.Web.Controllers
             }
         }
 
+        [Authorize]
         [HttpPost("api/envelope/{envelopeKey}")]
         public async Task<IActionResult> Update(string envelopeKey, int index)
         {
diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs
index 7434c6e8..1cebe629 100644
--- a/EnvelopeGenerator.Web/Controllers/HomeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs
@@ -108,7 +108,7 @@ namespace EnvelopeGenerator.Web.Controllers
                 if(uuid is null || signature is null)
                 {
                     _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: _localizer[MessageKey.WrongEnvelopeReceiverId]);
-                    return BadRequest(_localizer[MessageKey.WrongEnvelopeReceiverId]);
+                    return Unauthorized();
                 }
 
                 _logger.LogInformation($"Envelope UUID: [{uuid}]\nReceiver Signature: [{signature}]");
@@ -174,7 +174,7 @@ namespace EnvelopeGenerator.Web.Controllers
                     Fail: (messages, notices) =>
                     {
                         _logger.LogNotice(notices);
-                        return notices.HasFlag(Flag.SecurityBreach) ? Forbid() : StatusCode(StatusCodes.Status500InternalServerError, messages.Join());
+                        return Unauthorized();
                     });
             }
             catch(Exception ex)
@@ -226,7 +226,7 @@ namespace EnvelopeGenerator.Web.Controllers
             return Ok(new { EnvelopeUuid = envelopeUuid, ReceiverSignature = receiverSignature });
         }
 
-        [HttpGet("lang")]
+        [NonAction]
         public IActionResult GetLanguage() => Ok(UserLanguage);
 
         [HttpPost("lang")]