diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0abc851..3cec675 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +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$/octoprint_mystromswitch/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/octoprint_mystromswitch/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
     <option name="SHOW_DIALOG" value="false" />
@@ -47,13 +48,6 @@
       <option name="presentableId" value="Default" />
       <updated>1574193087583</updated>
     </task>
-    <task id="LOCAL-00035" summary="#8 Relais ein / ausschalten von Ocotprint aus">
-      <created>1574609194050</created>
-      <option name="number" value="00035" />
-      <option name="presentableId" value="LOCAL-00035" />
-      <option name="project" value="LOCAL" />
-      <updated>1574609194050</updated>
-    </task>
     <task id="LOCAL-00036" summary="#8 Relais ein / ausschalten von Ocotprint aus">
       <created>1574609901438</created>
       <option name="number" value="00036" />
@@ -390,7 +384,14 @@
       <option name="project" value="LOCAL" />
       <updated>1593354627917</updated>
     </task>
-    <option name="localTasksCounter" value="84" />
+    <task id="LOCAL-00084" summary="#21 Add PowerOFF when print is finished">
+      <created>1593354891881</created>
+      <option name="number" value="00084" />
+      <option name="presentableId" value="LOCAL-00084" />
+      <option name="project" value="LOCAL" />
+      <updated>1593354891881</updated>
+    </task>
+    <option name="localTasksCounter" value="85" />
     <servers />
   </component>
   <component name="UnknownFeatures">
diff --git a/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2 b/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2
index c82d89c..a5382b9 100644
--- a/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2
+++ b/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2
@@ -2,12 +2,12 @@
     <label class="control-label" id="mystromswitchPowerValue">Powerconsumption 0.0W</label>
     <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">
+    <label class="checkbox" data-bind="visible :showShutdownOctopiOption">
 		<input type="checkbox" data-bind="enable: loginState.isUser(), checked: automaticShutdownEnabled, visible :showShutdownOctopiOption">
 		{{ _('Shutdown Octoprint after print finishes') }}
 	</label>
 
-	<label class="checkbox">
+	<label class="checkbox" data-bind="visible: showPowerOffPrintFinishOption">
 		<input type="checkbox" data-bind="enable: loginState.isUser(), checked: automaticPowerOffEnabled, visible: showPowerOffPrintFinishOption">
 		{{ _('Power Off Relais after print finishes') }}
 	</label>