diff --git a/automations.yaml b/automations.yaml
index f4d74c6..069d36c 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -372,7 +372,11 @@
     entity_id: person.marcus_scholz
     zone: zone.home
     event: leave
-  condition: []
+  condition:
+  - condition: state
+    entity_id: person.marianna_scholz
+    state: not_home
+    enabled: false
   action:
   - service: light.turn_off
     target:
@@ -418,6 +422,12 @@
     - condition: sun
       after_offset: '-1'
       after: sunset
+    enabled: false
+  - condition: sun
+    before: sunrise
+    before_offset: '+1'
+    after: sunset
+    after_offset: '-1'
   action:
   - service: script.moodlight_orange_plasma
     data: {}