diff --git a/js/app.js b/js/app.js
index 7ab56354..dda564fc 100755
--- a/js/app.js
+++ b/js/app.js
@@ -92,13 +92,11 @@ function CheckoutController($scope, $interval, Order, $timeout, Url) {
                     // show the checkout page
                     proccess_order_data();
                     $scope.checkout_panel  = true;
-                }else if($scope.crypto.code === 'btc'){
+                } else {
                     if (data.error && data.error.toLowerCase().indexOf("gap limit") !== -1)
-                      $scope.btc_gaplimit_error = data.error;
+                      $scope.gaplimit_error = data.error;
                     else
-                      $scope.address_error_btc = true;
-                }else if($scope.crypto.code === 'bch'){
-                    $scope.address_error_bch = true;
+                      $scope.address_error = true;
                 }
             });
         }
diff --git a/templates/blockonomics_checkout.php b/templates/blockonomics_checkout.php
index 4e4f901e..e5e7b89b 100755
--- a/templates/blockonomics_checkout.php
+++ b/templates/blockonomics_checkout.php
@@ -25,19 +25,14 @@
         <p><?=__('Unable to render correctly, Note to Administrator: Please enable lite mode in the Blockonomics plugin.', 'blockonomics-bitcoin-payments')?></p>
       </div>
       <!-- Address Error -->
-      <div id="address-error-btc" ng-show="address_error_btc" ng-cloak>
-        <h2><?=__('Could not generate new Bitcoin address', 'blockonomics-bitcoin-payments')?></h2>
+      <div id="address-error" ng-show="address_error" ng-cloak>
+        <h2><?=__('Could not generate new ', 'blockonomics-bitcoin-payments')?>{{crypto.name}}<?=__(' address', 'blockonomics-bitcoin-payments')?></h2>
         <p><?=__('Note to webmaster: Please login to your admin panel, navigate to Settings > Blockonomics > Currencies and click <i>Test Setup</i> to diagnose the issue.', 'blockonomics-bitcoin-payments')?></p>
       </div>
       <!-- Gap limit Error -->
-      <div id="address-error-btc-gaplimit" ng-show="btc_gaplimit_error" ng-cloak>
-        <h2><?=__('Could not generate new Bitcoin address', 'blockonomics-bitcoin-payments')?></h2>
-       <p><?=__('Note to webmaster:', 'blockonomics-bitcoin-payments')?> {{btc_gaplimit_error}}.</p>
-      </div>
-      <!-- BCH Address Error -->
-      <div id="address-error-bch" ng-show="address_error_bch" ng-cloak>
-        <h2><?=__('Could not generate new Bitcoin Cash address', 'blockonomics-bitcoin-payments')?></h2>
-        <p><?=__('Note to webmaster: Please follow the instructions <a href="https://help.blockonomics.co/en/support/solutions/articles/33000253348-bch-setup-on-woocommerce" target="_blank">here</a> to configure BCH payments.', 'blockonomics-bitcoin-payments')?></p>
+      <div id="address-error-gaplimit" ng-show="gaplimit_error" ng-cloak>
+        <h2><?=__('Could not generate new ', 'blockonomics-bitcoin-payments')?>{{crypto.name}}<?=__(' address', 'blockonomics-bitcoin-payments')?></h2>
+        <p><?=__('Note to webmaster:', 'blockonomics-bitcoin-payments')?> {{gaplimit_error}}.</p>
       </div>
       <!-- Payment Expired -->
       <div class="bnomics-order-expired-wrapper" ng-show="order.status == -3" ng-cloak>