diff --git a/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigAddon.vue b/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigAddon.vue
index 0c1a717..2998f1b 100644
--- a/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigAddon.vue
+++ b/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigAddon.vue
@@ -31,7 +31,6 @@ import { watch } from "vue";
 
 defineProps<{ loading: boolean }>();
 const backupConfigStore = useBackupConfigStore();
-
 const { data, addons, invertedAddons } = storeToRefs(backupConfigStore);
 watch(invertedAddons, () => {
   data.value.exclude.addon = [];
diff --git a/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigAutoClean.vue b/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigAutoClean.vue
index 484c067..0a05e1b 100644
--- a/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigAutoClean.vue
+++ b/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigAutoClean.vue
@@ -9,7 +9,7 @@
           <v-row dense>
             <v-col>
               <v-switch
-                label="Auto clean Home Assistant Backups"
+                label="Auto clean Home Assistant backups"
                 v-model="data.autoClean.homeAssistant.enabled"
                 hide-details="auto"
                 density="compact"
@@ -42,7 +42,7 @@
           <v-row dense>
             <v-col>
               <v-switch
-                label="Auto clean Cloud Backups"
+                label="Auto clean Cloud backups"
                 v-model="data.autoClean.webdav.enabled"
                 hide-details="auto"
                 density="compact"
diff --git a/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigAutoStop.vue b/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigAutoStop.vue
new file mode 100644
index 0000000..eaac1c9
--- /dev/null
+++ b/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigAutoStop.vue
@@ -0,0 +1,34 @@
+<template>
+  <v-card variant="elevated" elevation="7" height="100%">
+    <v-card-title class="text-center text-white bg-light-blue-darken-4">
+      Auto Stop Addon
+    </v-card-title>
+    <v-card-text class="text-white px-2 py-1">
+      <div v-if="loading" class="d-flex justify-center">
+        <v-progress-circular indeterminate color="orange"></v-progress-circular>
+      </div>
+      <v-checkbox
+        v-else
+        v-for="addon in addons"
+        v-model="data.autoStopAddon"
+        :key="addon.slug"
+        :label="addon.name"
+        :value="addon.slug"
+        :loading="loading"
+        hide-details="auto"
+        color="orange"
+        density="compact"
+      >
+      </v-checkbox>
+    </v-card-text>
+  </v-card>
+</template>
+
+<script setup lang="ts">
+import { useBackupConfigStore } from "@/stores/backupConfig";
+import { storeToRefs } from "pinia";
+
+defineProps<{ loading: boolean }>();
+const backupConfigStore = useBackupConfigStore();
+const { data, addons } = storeToRefs(backupConfigStore);
+</script>
diff --git a/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigSecurity.vue b/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigSecurity.vue
new file mode 100644
index 0000000..b19ea1d
--- /dev/null
+++ b/nextcloud_backup/frontend/src/components/settings/BackupConfig/BackupConfigSecurity.vue
@@ -0,0 +1,56 @@
+<template>
+  <v-card variant="elevated" elevation="7">
+    <v-card-title class="bg-light-blue-darken-4 text-center">
+      Security
+    </v-card-title>
+    <v-card-text>
+      <v-row justify="center" v-if="loading">
+        <v-col class="d-flex justify-center">
+          <v-progress-circular
+            indeterminate
+            color="orange"
+          ></v-progress-circular>
+        </v-col>
+      </v-row>
+      <template v-if="!loading">
+        <v-row class="mt-1">
+          <v-col>
+            <v-switch
+              label="Password protected backup"
+              v-model="data.password.enabled"
+              hide-details="auto"
+              density="compact"
+              inset
+              :loading="loading"
+              color="orange"
+            ></v-switch>
+          </v-col>
+        </v-row>
+        <v-fade-transition>
+          <v-row dense v-if="data.password.enabled">
+            <v-col>
+              <div class="text-subtitle-1 text-medium-emphasis">Password</div>
+              <v-text-field
+                v-model="data.password.value"
+                hide-details="auto"
+                density="compact"
+                variant="outlined"
+                color="orange"
+                type="password"
+              ></v-text-field>
+            </v-col>
+          </v-row>
+        </v-fade-transition>
+      </template>
+    </v-card-text>
+  </v-card>
+</template>
+
+<script setup lang="ts">
+import { useBackupConfigStore } from "@/stores/backupConfig";
+import { storeToRefs } from "pinia";
+
+defineProps<{ loading: boolean }>();
+const backupConfigStore = useBackupConfigStore();
+const { data } = storeToRefs(backupConfigStore);
+</script>
diff --git a/nextcloud_backup/frontend/src/components/settings/BackupConfigForm.vue b/nextcloud_backup/frontend/src/components/settings/BackupConfigForm.vue
index 7bc226d..bd9ed1a 100644
--- a/nextcloud_backup/frontend/src/components/settings/BackupConfigForm.vue
+++ b/nextcloud_backup/frontend/src/components/settings/BackupConfigForm.vue
@@ -55,6 +55,17 @@
         <BackupConfigAutoClean :loading="loading"></BackupConfigAutoClean>
       </v-col>
     </v-row>
+    <v-row dense>
+      <v-col>
+        <BackupConfigAutoStop :loading="loading"></BackupConfigAutoStop>
+      </v-col>
+    </v-row>
+    <v-divider class="my-4"></v-divider>
+    <v-row class="mb-10">
+      <v-col>
+        <BackupConfigSecurity :loading="loading"></BackupConfigSecurity>
+      </v-col>
+    </v-row>
   </v-form>
 </template>
 <script setup lang="ts">
@@ -68,6 +79,8 @@ import BackupConfigAddon from "./BackupConfig/BackupConfigAddon.vue";
 import BackupConfigAutoBackup from "./BackupConfig/BackupConfigAutoBackup.vue";
 import BackupConfigFolder from "./BackupConfig/BackupConfigFolder.vue";
 import BackupConfigAutoClean from "./BackupConfig/BackupConfigAutoClean.vue";
+import BackupConfigSecurity from "./BackupConfig/BackupConfigSecurity.vue";
+import BackupConfigAutoStop from "./BackupConfig/BackupConfigAutoStop.vue";
 
 const backupConfigStore = useBackupConfigStore();
 const { data } = storeToRefs(backupConfigStore);
diff --git a/nextcloud_backup/frontend/src/services/configService.ts b/nextcloud_backup/frontend/src/services/configService.ts
index 72b13b6..2027e81 100644
--- a/nextcloud_backup/frontend/src/services/configService.ts
+++ b/nextcloud_backup/frontend/src/services/configService.ts
@@ -33,5 +33,9 @@ function cleanupConfig(config: BackupConfig) {
   if (!config.autoClean.webdav.enabled) {
     config.autoClean.webdav.nbrToKeep = undefined;
   }
+
+  if (!config.password.enabled){
+    config.password.value = undefined;
+  }
   return config;
 }