diff --git a/kamailio/auth.cfg b/kamailio/auth.cfg
index 1313be2..4ba7e17 100644
--- a/kamailio/auth.cfg
+++ b/kamailio/auth.cfg
@@ -16,15 +16,15 @@ route[AUTH]
 route[AUTH_HEADERS]
 {
    remove_hf_re("^X-");
-    
+
    xavp_params_implode("hf", "$var(outx)");
    $var(out) = $(var(outx){re.subst,/^(.*);$$/\1/});
    $var(c) = $(var(out){param.count});
    xlog("L_DEBUG", "$ci|auth|headers $var(c) => $var(out) => $var(outx)\n");
    while($var(c) > 0) {
       $var(idx) = $var(c) - 1;
-      xlog("L_DEBUG", "$ci|auth|adding $(var(out){param.name,$var(idx)}): $(var(out){param.valueat,$var(idx)})\n");
-      append_hf("$(var(out){param.name,$var(idx)}): $(var(out){param.valueat,$var(idx)})\r\n");
+      xlog("L_DEBUG", "$ci|auth|adding $(var(out){param.name,$var(idx)}): $(var(out){param.valueat,$var(idx)}{s.unescape.param})\n");
+      append_hf("$(var(out){param.name,$var(idx)}): $(var(out){param.valueat,$var(idx)}{s.unescape.param})\r\n");
       $var(c) = $var(c) - 1;
    }
 
@@ -85,7 +85,8 @@ route[AUTH_CCVS]
           $xavp(hf[0]=>X-ecallmgr_Account-Realm) = $(xavp(ulattrs=>custom_channel_vars){kz.json,Account-Realm});
 
       if($(xavp(ulattrs=>custom_channel_vars){kz.json,Account-Name}{s.len}) > 0)
-          $xavp(hf[0]=>X-ecallmgr_Account-Name) = $(xavp(ulattrs=>custom_channel_vars){kz.json,Account-Name});
+          $xavp(hf[0]=>X-ecallmgr_Account-Name) = $(xavp(ulattrs=>custom_channel_vars){kz.json,Account-Name}{s.escape.param});
+          
 
       if($(xavp(ulattrs=>custom_channel_vars){kz.json,Presence-ID}{s.len}) > 0)
           $xavp(hf[0]=>X-ecallmgr_Presence-ID) = $(xavp(ulattrs=>custom_channel_vars){kz.json,Presence-ID});