diff --git a/custom_components/irrigation_unlimited/binary_sensor.py b/custom_components/irrigation_unlimited/binary_sensor.py
index 4265b6d..be3dabf 100644
--- a/custom_components/irrigation_unlimited/binary_sensor.py
+++ b/custom_components/irrigation_unlimited/binary_sensor.py
@@ -175,6 +175,7 @@ def extra_state_attributes(self):
         else:
             attr[ATTR_NEXT_SCHEDULE] = "deprecated (use next_zone)"
             attr[ATTR_NEXT_ZONE] = RES_NONE
+        attr |= self._controller.user
         return attr
 
 
@@ -259,4 +260,5 @@ def extra_state_attributes(self):
         if self._zone.show_timeline:
             attr[ATTR_TIMELINE] = self._zone.timeline()
         attr[ATTR_VOLUME] = self._zone.volume.total
+        attr |= self._zone.user
         return attr