diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f5747ff..fd43c5e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7e2e0eec-b22e-4d48-8f24-196d1ed9b51a" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/octoprint_mystromswitch/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/octoprint_mystromswitch/__init__.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2" beforeDir="false" afterPath="$PROJECT_DIR$/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -47,13 +49,6 @@
       <option name="presentableId" value="Default" />
       <updated>1574193087583</updated>
     </task>
-    <task id="LOCAL-00027" summary="#8 Relais ein / ausschalten von Ocotprint aus&#10;&#10;- Button Style auf default geändert&#10;- get_api_commands implementiert">
-      <created>1574605785309</created>
-      <option name="number" value="00027" />
-      <option name="presentableId" value="LOCAL-00027" />
-      <option name="project" value="LOCAL" />
-      <updated>1574605785309</updated>
-    </task>
     <task id="LOCAL-00028" summary="#8 Relais ein / ausschalten von Ocotprint aus&#10;&#10;- url korrigiert">
       <created>1574606064523</created>
       <option name="number" value="00028" />
@@ -390,7 +385,14 @@
       <option name="project" value="LOCAL" />
       <updated>1593347943336</updated>
     </task>
-    <option name="localTasksCounter" value="76" />
+    <task id="LOCAL-00076" summary="#21 Add PowerOFF when print is finished">
+      <created>1593348030528</created>
+      <option name="number" value="00076" />
+      <option name="presentableId" value="LOCAL-00076" />
+      <option name="project" value="LOCAL" />
+      <updated>1593348030528</updated>
+    </task>
+    <option name="localTasksCounter" value="77" />
     <servers />
   </component>
   <component name="UnknownFeatures">
diff --git a/octoprint_mystromswitch/__init__.py b/octoprint_mystromswitch/__init__.py
index 627d336..632924d 100644
--- a/octoprint_mystromswitch/__init__.py
+++ b/octoprint_mystromswitch/__init__.py
@@ -276,10 +276,10 @@ class MyStromSwitchPlugin(octoprint.plugin.SettingsPlugin,
     def on_event(self, event, payload):
 
         if event == Events.CLIENT_OPENED:
-            self._plugin_manager.send_plugin_message(self._identifier,
-                                                     dict(automaticShutdownEnabled=self.shutdownAfterPrintFinished))
-            self._plugin_manager.send_plugin_message(self._identifier,
-                                                     dict(automaticPowerOffEnabled=self.powerOffAfterPrintFinished))
+            #self._plugin_manager.send_plugin_message(self._identifier,
+            #                                         dict(automaticShutdownEnabled=self.shutdownAfterPrintFinished))
+            #self._plugin_manager.send_plugin_message(self._identifier,
+            #                                         dict(automaticPowerOffEnabled=self.powerOffAfterPrintFinished))
             return
 
         if not self.shutdownAfterPrintFinished and not self.powerOffAfterPrintFinished:
diff --git a/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2 b/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2
index b502b91..c063687 100644
--- a/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2
+++ b/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2
@@ -3,12 +3,12 @@
     <label class="control-label" id="mystromswitchEnergyValue">Energy 0.0Wh</label>
     <button class="btn btn-primary" data-bind="click: onToggleRelayEvent, visible : onOffButtonEnabled">{{ _('Toggle Relais') }}</button>
     <label class="checkbox">
-		<input type="checkbox" data-bind="enable: loginState.isUser(), change: automaticShutdownEnabled, visible :showShutdownOctopiOption"/>
+		<input type="checkbox" data-bind="enable: loginState.isUser(), change: automaticShutdownEnabled, visible :showShutdownOctopiOption">
 		{{ _('Shutdown Octoprint after print finishes') }}
 	</label>
 
 	<label class="checkbox">
-		<input type="checkbox" data-bind="enable: loginState.isUser(), change: automaticPowerOffEnabled, visible: showPowerOffPrintFinishOption"/>
+		<input type="checkbox" data-bind="enable: loginState.isUser(), change: automaticPowerOffEnabled, visible: showPowerOffPrintFinishOption">
 		{{ _('Power Off Relais after print finishes') }}
 	</label>
 </div>