diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index 68ddfef0da50923ed7f3738688666f5490d0261e..f1fb6008b8ed164956b6b9e753849191ee683363 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -784,7 +784,7 @@ JamiAccount::SIPStartCall(SIPCall& call, IpAddr target)
     JAMI_DBG("[call:%s] Sending SIP invite", call.getCallId().c_str());
 
     // Add user-agent header
-    sip_utils::addUserAgenttHeader(getUserAgentName(), tdata);
+    sip_utils::addUserAgentHeader(getUserAgentName(), tdata);
 
     if (pjsip_inv_send_msg(call.inviteSession_.get(), tdata) != PJ_SUCCESS) {
         JAMI_ERR("Unable to send invite message for this call");
@@ -3753,7 +3753,7 @@ JamiAccount::sendSIPMessage(SipConnection& conn,
     pjsip_msg_add_hdr(tdata->msg, hdr);
 
     // Add user-agent header
-    sip_utils::addUserAgenttHeader(getUserAgentName(), tdata);
+    sip_utils::addUserAgentHeader(getUserAgentName(), tdata);
 
     // Init tdata
     const pjsip_tpselector tp_sel = SIPVoIPLink::getTransportSelector(transport->get());
diff --git a/src/sip/sip_utils.cpp b/src/sip/sip_utils.cpp
index 4f37897cbe779749aeaaa5906e0fe082a5bbf350..da79ad6ca55f153b275b362692c34ed9b2b1108d 100644
--- a/src/sip/sip_utils.cpp
+++ b/src/sip/sip_utils.cpp
@@ -187,22 +187,21 @@ addContactHeader(const pj_str_t* contact_str, pjsip_tx_data* tdata)
 }
 
 void
-addUserAgenttHeader(const std::string& userAgent, pjsip_tx_data* tdata)
+addUserAgentHeader(const std::string& userAgent, pjsip_tx_data* tdata)
 {
     if (tdata == nullptr)
         return;
 
-    pj_str_t pjUserAgent = pj_str((char*)userAgent.c_str());
-    constexpr pj_str_t STR_USER_AGENT = jami::sip_utils::CONST_PJ_STR("User-Agent");
+    auto pjUserAgent = CONST_PJ_STR(userAgent);
+    constexpr pj_str_t STR_USER_AGENT = CONST_PJ_STR("User-Agent");
 
     // Do nothing if user-agent header is present.
-    pjsip_hdr* hdr = static_cast<pjsip_hdr*>(pjsip_msg_find_hdr_by_name(tdata->msg, &STR_USER_AGENT, nullptr));
-    if (hdr != nullptr) {
+    if (pjsip_msg_find_hdr_by_name(tdata->msg, &STR_USER_AGENT, nullptr) != nullptr) {
         return;
     }
 
     // Add Header
-    hdr = reinterpret_cast<pjsip_hdr*>(
+    auto hdr = reinterpret_cast<pjsip_hdr*>(
         pjsip_user_agent_hdr_create(tdata->pool, &STR_USER_AGENT, &pjUserAgent));
 
     if (hdr != nullptr) {
diff --git a/src/sip/sip_utils.h b/src/sip/sip_utils.h
index a3be75e4b662f9bceba214441931cdfd6acb731f..a58e8b1f8f03a1b5375a1b5b5648e040c8e5c34b 100644
--- a/src/sip/sip_utils.h
+++ b/src/sip/sip_utils.h
@@ -99,7 +99,7 @@ std::string parseDisplayName(const pjsip_contact_hdr* header);
 std::string_view getHostFromUri(std::string_view sipUri);
 
 void addContactHeader(const pj_str_t* contactStr, pjsip_tx_data* tdata);
-void addUserAgenttHeader(const std::string& userAgent, pjsip_tx_data* tdata);
+void addUserAgentHeader(const std::string& userAgent, pjsip_tx_data* tdata);
 void logMessageHeaders(const pjsip_hdr* hdr_list);
 
 std::string sip_strerror(pj_status_t code);
diff --git a/src/sip/sipaccount.cpp b/src/sip/sipaccount.cpp
index c0653039f4ed407e676de946d56ac5cf104608c6..e124c1054bc3b91218a14a7ebd924105c74e0078 100644
--- a/src/sip/sipaccount.cpp
+++ b/src/sip/sipaccount.cpp
@@ -406,7 +406,7 @@ SIPAccount::SIPStartCall(std::shared_ptr<SIPCall>& call)
     }
 
     // Add user-agent header
-    sip_utils::addUserAgenttHeader(getUserAgentName(), tdata);
+    sip_utils::addUserAgentHeader(getUserAgentName(), tdata);
 
     if (pjsip_inv_send_msg(call->inviteSession_.get(), tdata) != PJ_SUCCESS) {
         JAMI_ERR("Unable to send invite message for this call");
@@ -2200,7 +2200,7 @@ SIPAccount::sendTextMessage(const std::string& to,
     pjsip_msg_add_hdr(tdata->msg, hdr);
 
     // Add user-agent header
-    sip_utils::addUserAgenttHeader(getUserAgentName(), tdata);
+    sip_utils::addUserAgentHeader(getUserAgentName(), tdata);
 
     // Set input token into callback
     std::unique_ptr<ctx> t {new ctx(new pjsip_auth_clt_sess)};
diff --git a/src/sip/sipcall.cpp b/src/sip/sipcall.cpp
index 5bccabb31a90eba0fde2fc549702cfc038d167e6..f294671524213c97ec934c2cb074baaf65a172ff 100644
--- a/src/sip/sipcall.cpp
+++ b/src/sip/sipcall.cpp
@@ -333,7 +333,7 @@ SIPCall::SIPSessionReinvite()
             return PJ_SUCCESS;
 
         // Add user-agent header
-        sip_utils::addUserAgenttHeader(acc->getUserAgentName(), tdata);
+        sip_utils::addUserAgentHeader(acc->getUserAgentName(), tdata);
 
         result = pjsip_inv_send_msg(inviteSession_.get(), tdata);
         if (result == PJ_SUCCESS)
@@ -486,7 +486,7 @@ SIPCall::terminateSipSession(int status)
                 }
 
                 // Add user-agent header
-                sip_utils::addUserAgenttHeader(account->getUserAgentName(), tdata);
+                sip_utils::addUserAgentHeader(account->getUserAgentName(), tdata);
 
                 ret = pjsip_inv_send_msg(inviteSession_.get(), tdata);
                 if (ret != PJ_SUCCESS)
@@ -553,7 +553,7 @@ SIPCall::answer()
     }
 
     // Add user-agent header
-    sip_utils::addUserAgenttHeader(account->getUserAgentName(), tdata);
+    sip_utils::addUserAgentHeader(account->getUserAgentName(), tdata);
 
     if (pjsip_inv_send_msg(inviteSession_.get(), tdata) != PJ_SUCCESS) {
         setInviteSession();
diff --git a/src/sip/sipvoiplink.cpp b/src/sip/sipvoiplink.cpp
index 25132634f51a6928e3a31b5a3479806e14ad7586..f3fd9f6092e400f800d2bda19b157cd4c202f998 100644
--- a/src/sip/sipvoiplink.cpp
+++ b/src/sip/sipvoiplink.cpp
@@ -497,7 +497,7 @@ transaction_request_cb(pjsip_rx_data* rdata)
     }
 
     // Add user-agent header
-    sip_utils::addUserAgenttHeader(account->getUserAgentName(), tdata);
+    sip_utils::addUserAgentHeader(account->getUserAgentName(), tdata);
 
     if (pjsip_inv_send_msg(call->inviteSession_.get(), tdata) != PJ_SUCCESS) {
         JAMI_ERR("Could not send msg TRYING");