diff --git a/automation/dash_buttons.yaml b/automation/dash_buttons.yaml
index 886555a7..3f27f4cf 100755
--- a/automation/dash_buttons.yaml
+++ b/automation/dash_buttons.yaml
@@ -10,7 +10,7 @@
   action:
     # Disable this automation
     - service: automation.turn_off
-      entity_id: dash_buttons.yaml
+      entity_id: automation.toggle_office_light_onoff
     - service: light.toggle
       entity_id: light.office_lamp
     - delay:
diff --git a/automation/medicine_logger.yaml b/automation/medicine_logger.yaml
index 7fb086e3..104759e4 100755
--- a/automation/medicine_logger.yaml
+++ b/automation/medicine_logger.yaml
@@ -1,5 +1,5 @@
 ###################################
-##  LOG IFTTT Stuff - Rachio
+##  LOG Medicine
 ###################################
 - alias: 'Log Medicine Activity'
   hide_entity: True
@@ -11,7 +11,8 @@
 
     - service: input_boolean.turn_on
       entity_id: input_boolean.medicine
-
+    - service: automation.turn_off
+      entity_id: automation.log_medicine_activity
     - service: logbook.log
       data:
         name: "Medicine Push"
@@ -26,3 +27,7 @@
     -  service: script.ifttt_notify
        data_template:
          value1: 'Took Medicine today.'
+
+    -  delay:
+         minutes: 1
+    - service: automation.turn_on