diff --git a/lib/sip-trunk-options-ping.js b/lib/sip-trunk-options-ping.js
index 684829d..e9bc573 100644
--- a/lib/sip-trunk-options-ping.js
+++ b/lib/sip-trunk-options-ping.js
@@ -57,12 +57,12 @@ class OptionsBot {
             const carrier = await lookupCarrierBySid(this.voip_carrier_sid);
             if (carrier) {
               // eslint-disable-next-line max-len
-              this.logger.info(`Disabling Options ping for ${this.ipv4} in carrier ${carrier.name} (sid:${carrier.voip_carrier_sid})`);
+              this.logger.info(`Disabling Options ping for ${this.ipv4} in carrier ${carrier.name}:${carrier.voip_carrier_sid} due to ${res.status}`);
               writeAlerts({
                 account_sid: carrier.account_sid,
                 service_provider_sid: carrier.service_provider_sid,
                 // eslint-disable-next-line max-len
-                message: `Disabling Options ping for ${this.ipv4} in carrier ${carrier.name} (sid:${carrier.voip_carrier_sid})`
+                message: `Disabling Options ping for ${this.ipv4} in carrier ${carrier.name}:${carrier.voip_carrier_sid} due to ${res.status}`
               });
             }
 
diff --git a/lib/sip-trunk-register.js b/lib/sip-trunk-register.js
index 02c1616..338583b 100644
--- a/lib/sip-trunk-register.js
+++ b/lib/sip-trunk-register.js
@@ -61,8 +61,8 @@ function getUniqueGateways(gateways, logger) {
   const uniqueGatewayKeys = new Set();
 
   return gateways.filter((gw) => {
-    const key = `${gw.ipv4}:${gw.sip_realm}:${gw.username}:${gw.password}`;
-    if (!gw.password) {
+    const key = `${gw.ipv4}:${gw.sip_realm}:${gw.carrier?.register_username}:${gw.carrier?.register_password}`;
+    if (!gw.carrier?.register_password) {
       logger.info({gw}, `Gateway ${key} does not have a password, ignoring`);
       return false;
     }
@@ -223,7 +223,7 @@ const updateCarrierRegbots = async(logger, srf) => {
 
       // start new regbots
       let batch_count = 0;
-      for (const gw of getUniqueGateways(gateways)) {
+      for (const gw of getUniqueGateways(gateways, logger)) {
         try {
           const rb = new Regbot(logger, {
             voip_carrier_sid: gw.carrier.voip_carrier_sid,