diff --git a/controllers/main.py b/controllers/main.py
index 69438678ca5e40beb81f24857a10d345aeb45364..584db0fbd65e63f7d73e6dc1c0809854ace72df8 100644
--- a/controllers/main.py
+++ b/controllers/main.py
@@ -18,7 +18,7 @@ class PortalAccount(PortalAccount):
         domain = expression.AND(
             [
                 [("acc_operation_id", "=", operation.id)],
-                [("acc_delivery_counter_id", "=", False)],
+                [("acc_delivery_counter_ids", "=", False)],
                 [
                     (
                         "move_type",
@@ -40,6 +40,7 @@ class PortalAccount(PortalAccount):
             not values.get("isSuperAdmin")
             and not values.get("isAdmin")
             and not values.get("isPmo")
+            and not values.get("isBillingAgent")
         ):
             subdomain = expression.OR(
                 [
diff --git a/templates/operation_templates_page.xml b/templates/operation_templates_page.xml
index 67f0f2dafd0ceb6c6d0cd8814570399721ab2437..d56553bb2a89f762b33c6da5069c966d52e526d0 100644
--- a/templates/operation_templates_page.xml
+++ b/templates/operation_templates_page.xml
@@ -6,7 +6,7 @@
         <xpath expr="//li[@id='menu-contact']" position="before">
             <li
                 class="nav-item"
-                t-if="operation.is_invoicing_surplus_active and (isProductor or isAdmin or isSuperAdmin)"
+                t-if="operation.is_invoicing_surplus_active and (isProductor or isAdmin or isSuperAdmin or isBillingAgent)"
             >
                 <a
                     t-attf-href="/operation/#{slug(operation)}/invoices-surplus"