diff --git a/custom_components/ocpp/api.py b/custom_components/ocpp/api.py
index 689ef52f..d55477bb 100644
--- a/custom_components/ocpp/api.py
+++ b/custom_components/ocpp/api.py
@@ -1128,6 +1128,8 @@ def on_diagnostics_status(self, status, **kwargs):
     @on(Action.Authorize)
     def on_authorize(self, id_tag, **kwargs):
         """Handle an Authorization request."""
+        self._metrics[cstat.id_tag.value].value = id_tag
+
         return call_result.AuthorizePayload(
             id_tag_info={om.status.value: AuthorizationStatus.accepted.value}
         )
@@ -1135,6 +1137,7 @@ def on_authorize(self, id_tag, **kwargs):
     @on(Action.StartTransaction)
     def on_start_transaction(self, connector_id, id_tag, meter_start, **kwargs):
         """Handle a Start Transaction request."""
+        self._metrics[cstat.id_tag.value].value = id_tag
         self._transactionId = int(time.time())
         self._metrics[cstat.stop_reason.value].value = ""
         self._metrics[csess.transaction_id.value].value = self._transactionId
diff --git a/custom_components/ocpp/enums.py b/custom_components/ocpp/enums.py
index cc53547e..34dcf893 100644
--- a/custom_components/ocpp/enums.py
+++ b/custom_components/ocpp/enums.py
@@ -33,6 +33,7 @@ class HAChargerStatuses(str, Enum):
     stop_reason = "Stop.Reason"
     firmware_status = "Status.Firmware"
     reconnects = "Reconnects"
+    id_tag = "Id.Tag"
 
 
 class HAChargerDetails(str, Enum):