diff --git a/apps/nspanel-lovelace-ui/luibackend/config.py b/apps/nspanel-lovelace-ui/luibackend/config.py
index df83afbb..e8ccd590 100644
--- a/apps/nspanel-lovelace-ui/luibackend/config.py
+++ b/apps/nspanel-lovelace-ui/luibackend/config.py
@@ -15,6 +15,7 @@ class Entity(object):
         self.condState     = entity_input_config.get("state")
         self.condStateNot  = entity_input_config.get("state_not")
         self.assumedState  = entity_input_config.get("assumed_state", False)
+        self.data  = entity_input_config.get("data", {})
 
 class Card(object):
     def __init__(self, card_input_config, pos=None):
diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py
index 81ccddfa..f85a432e 100644
--- a/apps/nspanel-lovelace-ui/luibackend/controller.py
+++ b/apps/nspanel-lovelace-ui/luibackend/controller.py
@@ -298,6 +298,8 @@ class LuiController(object):
                     self._ha_api.get_entity(entity_id).call_service("start")
                 else:
                     self._ha_api.get_entity(entity_id).call_service("return_to_base")
+            elif entity_id.startswith('service'):
+                self._ha_api.call_service(entity_id.replace('service.', '', 1), **le.data)
 
         # for media page
         if button_type == "media-next":