diff --git a/core/scripts/webpanel/assets/js/users.js b/core/scripts/webpanel/assets/js/users.js
index 08e6a57..fa911d6 100644
--- a/core/scripts/webpanel/assets/js/users.js
+++ b/core/scripts/webpanel/assets/js/users.js
@@ -146,11 +146,13 @@ $(function () {
 
         const trafficText = dataRow.find("td:eq(4)").text();
         const expiryText = dataRow.find("td:eq(6)").text();
+        const note = dataRow.find(".note-cell").data('note');
         
         $("#originalUsername").val(user);
         $("#editUsername").val(user);
         $("#editTrafficLimit").val(parseFloat(trafficText.split('/')[1]) || 0);
         $("#editExpirationDays").val(parseInt(expiryText) || 0);
+        $("#editNote").val(note || '');
         $("#editBlocked").prop("checked", !dataRow.find("td:eq(8) i").hasClass("text-success"));
         $("#editUnlimitedIp").prop("checked", dataRow.find(".unlimited-ip-cell i").hasClass("text-primary"));
     });
diff --git a/core/scripts/webpanel/templates/users.html b/core/scripts/webpanel/templates/users.html
index 0c96ce0..06c4002 100644
--- a/core/scripts/webpanel/templates/users.html
+++ b/core/scripts/webpanel/templates/users.html
@@ -135,6 +135,7 @@
                             <th class="d-none d-md-table-cell text-nowrap">Expiry Days</th>
                             <th class="d-none d-md-table-cell text-nowrap">Day Usage</th>
                             <th class="d-none d-md-table-cell">Enable</th>
+                            <th class="d-none d-md-table-cell">Note</th>
                             <th class="d-none d-md-table-cell text-nowrap requires-iplimit-service" style="display: none;">Unlimited IP</th>
                             <th class="d-none d-md-table-cell text-nowrap">Configs</th>
                             <th class="d-none d-md-table-cell text-nowrap">Actions</th>
@@ -176,6 +177,11 @@
                                 <i class="fas fa-times-circle text-danger"></i>
                                 {% endif %}
                             </td>
+                            <td class="d-none d-md-table-cell note-cell" data-note="{{ user.note or '' }}">
+                                {% if user.note %}
+                                    <span title="{{ user.note }}">{{ user.note | truncate(20, True) }}</span>
+                                {% endif %}
+                            </td>
                             <td class="d-none d-md-table-cell unlimited-ip-cell requires-iplimit-service" style="display: none;">
                                 {% if user.unlimited_ip %}
                                 <i class="fas fa-shield-alt text-primary"></i>
@@ -235,6 +241,7 @@
                                     <p><strong>Expiry Date:</strong> <span>{{ user.expiry_date }}</span></p>
                                     <p><strong>Expiry Days:</strong> <span>{{ user.expiry_days }}</span></p>
                                     <p><strong>Day Usage:</strong> <span>{{ user.day_usage }}</span></p>
+                                    <p><strong>Note:</strong> <span>{{ user.note or 'N/A' }}</span></p>
                                     <p><strong>Enable:</strong>
                                         <span>
                                             {% if user.enable %}
@@ -383,6 +390,10 @@
                                 <label for="addExpirationDays">Expiration Days</label>
                                 <input type="number" class="form-control" id="addExpirationDays" name="expiration_days" required>
                             </div>
+                            <div class="form-group">
+                                <label for="addNote">Note (Optional)</label>
+                                <input type="text" class="form-control" id="addNote" name="note">
+                            </div>
                             <div class="form-check mb-3 requires-iplimit-service" style="display: none;">
                                 <input type="checkbox" class="form-check-input" id="addUnlimited" name="unlimited">
                                 <label class="form-check-label" for="addUnlimited">Unlimited IP</label>
@@ -469,6 +480,10 @@
                             <input type="number" class="form-control" id="editExpirationDays" name="new_expiration_days">
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label for="editNote">Note</label>
+                        <textarea class="form-control" id="editNote" name="note" rows="3"></textarea>
+                    </div>
                     <div class="form-check">
                         <input type="checkbox" class="form-check-input" id="editBlocked" name="blocked">
                         <label class="form-check-label" for="editBlocked">