diff --git a/scripts/modules/b2b-account/edit-quote.js b/scripts/modules/b2b-account/edit-quote.js
index bde39eafe..ea88ad2a3 100644
--- a/scripts/modules/b2b-account/edit-quote.js
+++ b/scripts/modules/b2b-account/edit-quote.js
@@ -457,14 +457,10 @@ define([
             var customerAccountId = self.model.get('customerAccountId');
             if (!self.model.get('b2bUsers')) {
                 var b2bAccount = new B2BAccountModels.b2bAccount({ id: customerAccountId });
-                b2bAccount.apiGet().then(function (account) {
-                    return b2bAccount.apiGetUsers().then(function (users) {
-                        self.model.isLoading(false);
-                        self.model.set("b2bUsers", users.data.items);
-                        self.render();
-                    }, function (error) {
-                        self.showMessageBar(error);
-                    });
+                b2bAccount.apiGetUsers().then(function (users) {
+                    self.model.isLoading(false);
+                    self.model.set("b2bUsers", users.data.items);
+                    self.render();
                 }, function (error) {
                     self.showMessageBar(error);
                 });
diff --git a/templates/modules/cart/cart-table.hypr.live b/templates/modules/cart/cart-table.hypr.live
index a5f626230..8e3243e92 100644
--- a/templates/modules/cart/cart-table.hypr.live
+++ b/templates/modules/cart/cart-table.hypr.live
@@ -84,7 +84,7 @@
                       {% if externalPayment.name == "VisaCheckout" %}
                         <img alt="Visa Checkout" class="v-button" role="button" src="{{pageContext.visaCheckoutButtonUrl}}"/>
                       {%endif%}
-                      {% if externalPayment.name == "PayPalExpress2" %}
+                      {% if externalPayment.name.includes("paypal")"" %}
                         <img id="btn_xpressPaypal" class="p-button" alt="Check out with PayPal" role="button" src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/checkout-logo-medium.png" width="170px" height="32px" />
                       {%endif%}
                       {% if externalPayment.name == "APPLEPAY" %}
diff --git a/templates/modules/checkout/payment-selector.hypr.live b/templates/modules/checkout/payment-selector.hypr.live
index 8abe6df76..162e5e333 100644
--- a/templates/modules/checkout/payment-selector.hypr.live
+++ b/templates/modules/checkout/payment-selector.hypr.live
@@ -113,7 +113,7 @@
                                     src="{{pageContext.visaCheckoutButtonUrl}}?size=154&amp;color=neutral"/>
                                 </div>
                             {% endif %}
-                            {% if name == "paypalexpress2" %}
+                            {% if name.includes("paypal")%}
                                 <img id="btn_xpressPaypal" class="p-button" alt="Check out with PayPal" role="button" src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/checkout-logo-medium.png" width="170px" height="32px" align="left" style="margin-right:7px; float:right;"/>
                             {%endif%}
                              {% if name == "paywithamazon" %}
diff --git a/templates/modules/multi-ship-checkout/payment-selector.hypr.live b/templates/modules/multi-ship-checkout/payment-selector.hypr.live
index 8cd68f060..867b62fe0 100644
--- a/templates/modules/multi-ship-checkout/payment-selector.hypr.live
+++ b/templates/modules/multi-ship-checkout/payment-selector.hypr.live
@@ -108,7 +108,7 @@
                                     src="{{pageContext.visaCheckoutButtonUrl}}?size=154&amp;color=neutral"/>
                                 </div>
                             {% endif %}
-                            {% if name == "paypalexpress2" %}
+                            {% if name.includes("paypal") %}
                                 <img id="btn_xpressPaypal" class="p-button" alt="Check out with PayPal" role="button" src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/checkout-logo-medium.png" width="170px" height="32px" align="left" style="margin-right:7px; float:right;"/>
                             {%endif%}
                             {% if name == "paywithamazon" %}