diff --git a/agrirouter/auth/response.py b/agrirouter/auth/response.py
index a4b87f7f..a8f6c13e 100644
--- a/agrirouter/auth/response.py
+++ b/agrirouter/auth/response.py
@@ -48,6 +48,7 @@ def verify(self, public_key) -> None:
         unquoted_signature = unquote(self.signature)
         encoded_signature = base64.b64decode(unquoted_signature.encode("utf-8"))
 
+        self._is_valid = True
         try:
             verify_signature(encoded_data, encoded_signature, public_key)
         except InvalidSignature:
@@ -56,7 +57,6 @@ def verify(self, public_key) -> None:
         finally:
             self._was_verified = True
 
-        self._is_valid = True
 
     @staticmethod
     def decode_token(token: Union[str, bytes]) -> AuthorizationToken:
diff --git a/agrirouter/messaging/encode.py b/agrirouter/messaging/encode.py
index f1f40513..91461ed7 100644
--- a/agrirouter/messaging/encode.py
+++ b/agrirouter/messaging/encode.py
@@ -37,6 +37,8 @@ def encode_header(header_parameters: MessageHeaderParameters) -> RequestEnvelope
     if header_parameters.get_team_set_context_id() is not None:
         request_envelope.team_set_context_id = header_parameters.get_team_set_context_id()
     request_envelope.timestamp.FromDatetime(now_as_utc_timestamp())
+    if header_parameters.get_recipients() is not None:
+        request_envelope.recipients.MergeFrom(header_parameters.get_recipients())
 
     return request_envelope