diff --git a/supernode/index.html b/supernode/index.html
index d9cef87..0b78c01 100644
--- a/supernode/index.html
+++ b/supernode/index.html
@@ -14577,7 +14577,7 @@
                                         let buyerBTCResponseObject;
                                         let buyer_btc_id =
                                             `${buyPipeObj.trader_flo_address}_${buyPipeObj.product}`;
-                                        _readDB("crypto_balances", buyPipeObj.trader_flo_address).then(
+                                        _readDB("crypto_balances", buyer_btc_id).then(
                                             function (buyPipeBTCRes) {
                                                 if (typeof buyPipeBTCRes == "object" && typeof buyPipeBTCRes
                                                     .crypto_balance == "number") {
@@ -14588,7 +14588,7 @@
                                                 } else {
                                                     // The user bought BTC for first time
                                                     buyerBTCResponseObject = {
-                                                        id: `${buyPipeObj.trader_flo_address}_${buyPipeObj.product}`,
+                                                        id: buyer_btc_id,
                                                         trader_flo_address: buyPipeObj.trader_flo_address,
                                                         crypto_balance: eqBTCBuyer,
                                                         crypto_currency: buyPipeObj.product
@@ -16865,7 +16865,7 @@
             
                             console.log("ifAllPrevSuAreDead: ", ifAllPrevSuAreDead);
 
-                            if (ifAllPrevSuAreDead !== true) {
+                            if (ifAllPrevSuAreDead !== true || res_obj.method=='sync_backup_supernode_from_backup_supernode_response') {
                                 console.log(res_obj);
                                 showMessage(`INFO: "checkIfAllPreviousSupernodesAreDeadForAUserNode" check failed.`);
                                 handle_backup_server_messages(response);