diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs b/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs
index 6276d8260cd9..57b9aeb2dc1b 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs
@@ -217,7 +217,7 @@ public virtual Response<AnswerCallResult> AnswerCall(AnswerCallOptions options,
             }
         }
 
-        private static AnswerCallRequestInternal CreateAnswerCallRequest(AnswerCallOptions options)
+        private AnswerCallRequestInternal CreateAnswerCallRequest(AnswerCallOptions options)
         {
             // validate callbackUri
             if (!IsValidHttpsUri(options.CallbackUri))
@@ -236,6 +236,7 @@ private static AnswerCallRequestInternal CreateAnswerCallRequest(AnswerCallOptio
                 request.AzureCognitiveServicesEndpointUrl = options.AzureCognitiveServicesEndpointUrl.AbsoluteUri;
             }
             request.MediaStreamingConfiguration = CreateMediaStreamingOptionsInternal(options.MediaStreamingOptions);
+            request.AnsweredByIdentifier = Source == null ? null : CommunicationIdentifierSerializer.Serialize(Source);
 
             return request;
         }
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs b/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs
index f4ac656f7720..b1752e90956c 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs
@@ -305,7 +305,7 @@ private static TransferToParticipantRequestInternal CreateTransferToParticipantR
 
             foreach (var voipHeader in options.CallInvite.VoipHeaders)
             {
-                request.CustomContext.SipHeaders.Add(voipHeader.Key, voipHeader.Value);
+                request.CustomContext.VoipHeaders.Add(voipHeader.Key, voipHeader.Value);
             }
 
             if (options.OperationContext != null && options.OperationContext.Length > CallAutomationConstants.InputValidation.StringMaxLength)
@@ -450,7 +450,7 @@ private static AddParticipantRequestInternal CreateAddParticipantRequest(AddPart
 
             foreach (var voipHeader in options.ParticipantToAdd.VoipHeaders)
             {
-                request.CustomContext.SipHeaders.Add(voipHeader.Key, voipHeader.Value);
+                request.CustomContext.VoipHeaders.Add(voipHeader.Key, voipHeader.Value);
             }
 
             return request;
diff --git a/sdk/communication/Azure.Communication.CallAutomation/tests/CallConnections/CallConnectionTests.cs b/sdk/communication/Azure.Communication.CallAutomation/tests/CallConnections/CallConnectionTests.cs
index d2ff890880a4..cdda957a33ff 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/tests/CallConnections/CallConnectionTests.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/tests/CallConnections/CallConnectionTests.cs
@@ -562,7 +562,7 @@ private CallConnection CreateMockCallConnection(int responseCode, string? respon
                 new object?[]
                 {
                     new CallInvite(new CommunicationUserIdentifier("userId")){
-                        SipHeaders = {{ "key1", "value1" }}}
+                        VoipHeaders = {{ "key1", "value1" }}}
                 },
             };
         }