diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba95658..65e3467 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [unreleased]
+
+## Fixe
+
+- Fix the maximum consumable quantity value displayed in the tooltip
+
 ## [1.15.0] - 2025-09-29
 
 ### Added
diff --git a/templates/tickets/consume.html.twig b/templates/tickets/consume.html.twig
index 6b851ef..e9dd2a5 100644
--- a/templates/tickets/consume.html.twig
+++ b/templates/tickets/consume.html.twig
@@ -87,23 +87,21 @@
     <script>
         function showCreditDiv{{ rand }}() {
             const creditVoucherBlock = document.getElementById('creditvoucherblock{{ rand }}');
-            console.log('plugin-credit-quantity_{{ rand }}');
             if (creditVoucherBlock) {
                 creditVoucherBlock.style.display = creditVoucherBlock.style.display === 'none' ? 'block' : 'none';
             }
         }
 
         function getQuantityRemaining{{ rand }}(val) {
-            console.log('plugin-credit-quantity_{{ rand }}');
             consumeblock = document.querySelector('[name="credit_consume_{{ rand }}"]');
-            quantity = consumeblock.querySelector('[id*="plugin-credit-quantity_{{ rand }}"]');
-            quantity_label = consumeblock.querySelector('[for*="plugin-credit-quantity_{{ rand }}"]');
+            quantity = consumeblock.querySelector('[id*="plugin_credit_quantity_{{ rand }}"]');
+            quantity_label = consumeblock.querySelector('[for*="plugin_credit_quantity_{{ rand }}"]');
             if (val == 0) {
                 quantity_label.style.display = 'none';
                 quantity.style.display = 'none';
-
                 quantity.max = 0;
                 quantity.value = 0;
+                quantity_label.querySelector('span.form-help').setAttribute('data-bs-title', __('Maximum consumable quantity', 'credit') + ' : 0 ');
                 quantity_label.querySelector('span.form-help').setAttribute('data-bs-content', __('Maximum consumable quantity', 'credit') + ' : 0 ');
             } else {
                 quantity_label.style.display = 'block';
@@ -118,6 +116,7 @@
                 }).done(function (data) {
                     quantity.max = data;
                     quantity.value = 0;
+                    quantity_label.querySelector('span.form-help').setAttribute('data-bs-title', __('Maximum consumable quantity', 'credit') + ' : <b>' + data);
                     quantity_label.querySelector('span.form-help').setAttribute('data-bs-content', __('Maximum consumable quantity', 'credit') + ' : <b>' + data);
                 });
             }
diff --git a/templates/tickets/form.html.twig b/templates/tickets/form.html.twig
index 9586119..b9a3ac3 100644
--- a/templates/tickets/form.html.twig
+++ b/templates/tickets/form.html.twig
@@ -71,11 +71,12 @@
                     <script>
                         function getQuantityRemainingForm(val) {
                             var formblock = document.querySelector('.formblock');
-                            var quantity = formblock.querySelector('[id*="plugin-credit-quantity"]');
-                            var quantity_label = formblock.querySelector('[for*="plugin-credit-quantity"]');
+                            var quantity = formblock.querySelector('[id*="plugin_credit_quantity"]');
+                            var quantity_label = formblock.querySelector('[for*="plugin_credit_quantity"]');
 
                             if (val == 0) {
                                 quantity.value = 0;
+                                quantity_label.querySelector('span.form-help').setAttribute('data-bs-title', __('Maximum consumable quantity', 'credit') + ' : 0 ');
                                 quantity_label.querySelector('span.form-help').setAttribute('data-bs-content', __('Maximum consumable quantity', 'credit') + ' : 0 ');
                             } else {
                                 $.ajax({
@@ -87,6 +88,7 @@
                                 }).done(function (data) {
                                     quantity.max = data;
                                     quantity.value = 0;
+                                    quantity_label.querySelector('span.form-help').setAttribute('data-bs-title', __('Maximum consumable quantity', 'credit') + ' : <b>' + data);
                                     quantity_label.querySelector('span.form-help').setAttribute('data-bs-content', __('Maximum consumable quantity', 'credit') + ' : <b>' + data);
                                 });
                             }