diff --git a/kamailio/registrar-role.cfg b/kamailio/registrar-role.cfg
index a6b8ad4..1e359ff 100644
--- a/kamailio/registrar-role.cfg
+++ b/kamailio/registrar-role.cfg
@@ -178,6 +178,7 @@ route[HANDLE_REGISTER]
     }
 
     $vn(password) = $null;
+
     route_if_exists("CUSTOM_HANDLER_REGISTER");
 
     #!ifdef PUSHER_ROLE
@@ -338,7 +339,9 @@ route[CHECK_AUTHORIZATION]
 route[SUCCESS_AUTHORIZATION]
 {
     # user authenticated - remove auth header
-    consume_credentials();
+    if($hdr(Proxy-Authorization) != $null) {
+        consume_credentials();
+    }
 
     $xavp(ulattrs=>custom_channel_vars) = $(kzR{kz.json,Custom-Channel-Vars});
     $xavp(ulattrs[0]=>token) = $_s($(kzR{kz.json,Custom-Channel-Vars.Authorizing-ID})@$(kzR{kz.json,Custom-Channel-Vars.Account-ID}));
@@ -492,7 +495,7 @@ route[REGISTRAR_BINDINGS]
 
     #!ifndef REGISTRAR_CUSTOM_BINDINGS
 
-    $var(payload) = $_s({"name": "registrar-api", "exchange": "registrar", "type": "topic", "queue": "registrar-flush-MY_HOSTNAME", "routing": "registration.flush.*", "federate": 1 });
+    $var(payload) = $_s({"name": "registrar-api", "exchange": "registrar", "type": "topic", "queue": "registrar-flush-MY_HOSTNAME", "routing": "registration.flush.*", "federate": true });
     kazoo_subscribe("$var(payload)");
 
     #!endif
diff --git a/kamailio/trusted.cfg b/kamailio/trusted.cfg
index 8021b52..97af95f 100644
--- a/kamailio/trusted.cfg
+++ b/kamailio/trusted.cfg
@@ -111,7 +111,7 @@ route[TRUSTED_BINDINGS]
 
     #!ifndef TRUSTED_CUSTOM_BINDINGS
 
-    $var(payload) = $_s({"name": "trusted-reload", "exchange": "trusted", "type": "topic", "queue": "trusted-reload-MY_HOSTNAME", "routing": "trusted.reload", "federate": 1 });
+    $var(payload) = $_s({"name": "trusted-reload", "exchange": "trusted", "type": "topic", "queue": "trusted-reload-MY_HOSTNAME", "routing": "trusted.reload", "federate": true });
     kazoo_subscribe("$var(payload)");
 
     #!endif