diff --git a/hackerman/hackerman.py b/hackerman/hackerman.py
index 17f3c9fadf2a9243ec405126ce065620a7cdedf7..1747da04497f679dc6dd93019bec14587583c11a 100644
--- a/hackerman/hackerman.py
+++ b/hackerman/hackerman.py
@@ -22,15 +22,16 @@ class Hackerman:
         """
         React to a status change of the hackerspace - switch the lights, ...
         """
+        del client
         try:
             if 'haspa' in message:
-                if message['haspa'] == 'open':
+                if message['haspa'] in ['open', 'offen', 'auf']:
                     await self.hbf.publish('/haspa/power', {
                         'table':1023,
                         'fan':1023,
                         'ledstrip':400,
                         })
-                elif message['haspa'] == 'closed':
+                elif message['haspa'] in ['close', 'zu', 'closed']:
                     await self.hbf.publish('/haspa/power', {
                         'table':0,
                         'fan':0,
diff --git a/rupprecht/rupprecht.py b/rupprecht/rupprecht.py
index 8ab1209ead7a7d657e8a9f134ccb3534978b391d..9fd94fc9693e81a196db48e67ffe5394282eb60a 100644
--- a/rupprecht/rupprecht.py
+++ b/rupprecht/rupprecht.py
@@ -49,7 +49,9 @@ class Rupprecht:
     async def teardown(self):
         await self.hbf.teardown()
 
-    async def command_led(self, source, payload, msg):
+    async def command_led(self, source, payload, mqttmsg):
+        del source, payload
+        msg = json.loads(mqttmsg.payload.decode('utf-8'))
         for devid, value in msg.items():
             try:
                 if value == 0:
@@ -62,10 +64,10 @@ class Rupprecht:
     async def button_message(self, msg):
         if msg['open'] and not self.space_is_open:
             self.space_is_open = True
-            await self.hbf.publish('/haspa/status', 'open')
+            await self.hbf.publish('/haspa/status', json.dumps({'haspa':'open'}))
         elif not msg['open'] and self.space_is_open:
             self.space_is_open = False
-            await self.hbf.publish('/haspa/status', 'closed')
+            await self.hbf.publish('/haspa/status', json.dumps({'haspa':'closed'}))
 
 class RupprechtInterface:
     class SerialProtocol(asyncio.Protocol):