diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 39f194c..121e027 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
 <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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -47,13 +48,6 @@
       <option name="presentableId" value="Default" />
       <updated>1574193087583</updated>
     </task>
-    <task id="LOCAL-00041" summary="#9 Relais ausschalten wenn Octoprint heruntergefahren wird&#10;#7 Relais einschalten wenn Octoprint gestartet wurde">
-      <created>1574708023156</created>
-      <option name="number" value="00041" />
-      <option name="presentableId" value="LOCAL-00041" />
-      <option name="project" value="LOCAL" />
-      <updated>1574708023156</updated>
-    </task>
     <task id="LOCAL-00042" summary="#9 Relais ausschalten wenn Octoprint heruntergefahren wird&#10;#7 Relais einschalten wenn Octoprint gestartet wurde&#10;&#10;Api call fix">
       <created>1574708245896</created>
       <option name="number" value="00042" />
@@ -390,7 +384,14 @@
       <option name="project" value="LOCAL" />
       <updated>1593628347105</updated>
     </task>
-    <option name="localTasksCounter" value="90" />
+    <task id="LOCAL-00090" summary="#21 Add PowerOFF when print is finished">
+      <created>1593628617461</created>
+      <option name="number" value="00090" />
+      <option name="presentableId" value="LOCAL-00090" />
+      <option name="project" value="LOCAL" />
+      <updated>1593628617461</updated>
+    </task>
+    <option name="localTasksCounter" value="91" />
     <servers />
   </component>
   <component name="UnknownFeatures">
diff --git a/octoprint_mystromswitch/__init__.py b/octoprint_mystromswitch/__init__.py
index 9fe069c..11b6dd2 100644
--- a/octoprint_mystromswitch/__init__.py
+++ b/octoprint_mystromswitch/__init__.py
@@ -281,21 +281,25 @@ class MyStromSwitchPlugin(octoprint.plugin.SettingsPlugin,
             self.shutdownAfterPrintFinished = True
             if self.rememberShutdown:
                 self.lastShutdown = self.shutdownAfterPrintFinished
+                self._settings.set_boolean("lastShutdown",self.lastShutdown)
         elif command == "disableShutdownAfterFinish":
             self._logger.info("disableShutdownAfterFinish")
             self.shutdownAfterPrintFinished = False
             if self.rememberShutdown:
                 self.lastShutdown = self.shutdownAfterPrintFinished
+                self._settings.set_boolean("lastShutdown", self.lastShutdown)
         elif command == "enablePowerOffAfterFinish":
             self._logger.info("enablePowerOffAfterFinish")
             self.powerOffAfterPrintFinished = True
             if self.rememberShutdown:
                 self.lastPowerOff = self.powerOffAfterPrintFinished
+                self._settings.set_boolean("lastPowerOff", self.lastPowerOff)
         elif command == "disablePowerOffAfterFinish":
             self._logger.info("disablePowerOffAfterFinish")
             self.powerOffAfterPrintFinished = False
             if self.rememberShutdown:
                 self.lastPowerOff = self.powerOffAfterPrintFinished
+                self._settings.set_boolean("lastPowerOff", self.lastPowerOff)
 
     def get_api_commands(self):
         return dict(