diff --git a/ereuse_devicehub/templates/labels/label_detail.html b/ereuse_devicehub/templates/labels/label_detail.html
index 75ff3efb..24c8a535 100644
--- a/ereuse_devicehub/templates/labels/label_detail.html
+++ b/ereuse_devicehub/templates/labels/label_detail.html
@@ -43,16 +43,49 @@
Print Label
-
+
-
+
-
-
{{ tag.id }}
+
+
+ {% if tag.device %}
+ {{ tag.id }}
+ {% else %}
+ {{ tag.id }}
+ {% endif %}
+
+ {% if tag.device %}
+
+
+
+ {{ tag.device.serial_number or '' }}
+
+
+
+
+
+
+ {{ tag.device.manufacturer or '' }}
+
+
+
+
+
+
+ {{ tag.device.model or '' }}
+
+
+
+ {% endif %}
@@ -84,20 +117,43 @@
mm
+ {% if tag.device %}
+
+ {% endif %}
+
-
-