diff --git a/gui/components/form/Label.svelte b/gui/components/form/Label.svelte
index 94f9d8fce..6d1c2930e 100644
--- a/gui/components/form/Label.svelte
+++ b/gui/components/form/Label.svelte
@@ -4,6 +4,6 @@
   export let required = false;
 </script>
 
-<label for="{id}" class="col col-form-label text-truncate"
+<label for="{id}" title="{label}" class="col col-form-label text-truncate"
   >{label}{#if required === true}<span class="required text-danger ml-1">*</span>{/if}</label
 >
diff --git a/gui/locale/ca.json b/gui/locale/ca.json
index f52dc8cec..e78e12f3f 100644
--- a/gui/locale/ca.json
+++ b/gui/locale/ca.json
@@ -2096,6 +2096,12 @@
           "label": "Ràfega",
           "placeholder": "Seleccioneu el relé opcional per a Flash"
         },
+        "history": {
+          "help": "Introduïu la quantitat de dies que voleu conservar per a l'historial.",
+          "invalid": "Introduïu un valor mínim de {value}.",
+          "label": "Arxiu històric en dies",
+          "placeholder": "Introduïu el número"
+        },
         "light": {
           "help": "Estat de llum per prendre una imatge d’arxiu.",
           "invalid": "Feu una tria.",
@@ -2110,7 +2116,7 @@
         "options": {
           "day_1": "1 dia",
           "disabled": "Inhabilitat",
-          "hour_1": "30 minuts",
+          "hour_1": "1 hora",
           "hour_12": "12 hores",
           "hour_3": "3 hores",
           "hour_6": "6 hores",
diff --git a/gui/locale/de.json b/gui/locale/de.json
index 90087cb6e..8afced3fd 100644
--- a/gui/locale/de.json
+++ b/gui/locale/de.json
@@ -2096,6 +2096,12 @@
           "label": "Blitzlicht",
           "placeholder": "Optionales Relais für Blitz auswählen"
         },
+        "history": {
+          "help": "",
+          "invalid": "Bitte geben Sie einen Mindestwert von {value} ein.",
+          "label": "Archivverlauf in Tagen",
+          "placeholder": ""
+        },
         "light": {
           "help": "Lichtstatus zum Aufnehmen eines Archivbildes.",
           "invalid": "Bitte triff eine Wahl.",
diff --git a/gui/locale/de_AT.json b/gui/locale/de_AT.json
index e3f8465a2..adb042760 100644
--- a/gui/locale/de_AT.json
+++ b/gui/locale/de_AT.json
@@ -2005,6 +2005,11 @@
           "label": "Blitz",
           "placeholder": "Optionales Relais für Blitz auswählen"
         },
+        "history": {
+          "help": "Geben Sie die Anzahl der Tage ein, die für den Verlauf aufbewahrt werden sollen.",
+          "label": "Archivverlauf in Tagen",
+          "placeholder": "Nummer eingeben"
+        },
         "light": {
           "help": "Lichtstatus für die Aufnahme eines Archivbildes.",
           "invalid": "Bitte treffen Sie eine Wahl.",
@@ -2019,7 +2024,7 @@
         "options": {
           "day_1": "1 Tag",
           "disabled": "Aus",
-          "hour_1": "30 Minuten",
+          "hour_1": "1 Stunde",
           "hour_12": "12 Stunden",
           "hour_3": "3 Stunden",
           "hour_6": "6 Stunden",
diff --git a/gui/locale/en_US.json b/gui/locale/en_US.json
index 22a6aae91..7770328b1 100644
--- a/gui/locale/en_US.json
+++ b/gui/locale/en_US.json
@@ -2096,6 +2096,12 @@
           "label": "Flash",
           "placeholder": "Select optional relay for flash"
         },
+        "history": {
+          "help": "Enter the amount of days to keep for history.",
+          "invalid": "Please enter a minimum value of {value}.",
+          "label": "Archive history in days",
+          "placeholder": "Enter number"
+        },
         "light": {
           "help": "Light status for taking an archive image.",
           "invalid": "Please make a choice.",
@@ -2110,7 +2116,7 @@
         "options": {
           "day_1": "1 Day",
           "disabled": "Disabled",
-          "hour_1": "30 Minutes",
+          "hour_1": "1 Hour",
           "hour_12": "12 Hours",
           "hour_3": "3 Hours",
           "hour_6": "6 Hours",
diff --git a/gui/locale/es.json b/gui/locale/es.json
index 234c75d7b..272e565a1 100644
--- a/gui/locale/es.json
+++ b/gui/locale/es.json
@@ -2032,6 +2032,12 @@
           "label": "Destello",
           "placeholder": "Seleccione Relé opcional para Flash"
         },
+        "history": {
+          "help": "Ingrese la cantidad de días que se guardarán en el historial.",
+          "invalid": "Introduzca un valor mínimo de {value}.",
+          "label": "Historial de archivos en días",
+          "placeholder": "Introduzca el número"
+        },
         "light": {
           "help": "Estado de luz para tomar una imagen de archivo.",
           "invalid": "Por favor tome una decisión.",
diff --git a/gui/locale/es_AR.json b/gui/locale/es_AR.json
index 47cadd2be..601207192 100644
--- a/gui/locale/es_AR.json
+++ b/gui/locale/es_AR.json
@@ -1970,7 +1970,7 @@
         "options": {
           "day_1": "1 día",
           "disabled": "Desactivado",
-          "hour_1": "30 minutos",
+          "hour_1": "1 hora",
           "hour_12": "12 horas",
           "hour_3": "3 horas",
           "hour_6": "6 horas",
diff --git a/gui/locale/fr_BE.json b/gui/locale/fr_BE.json
index 90eef75ca..46e4fb619 100644
--- a/gui/locale/fr_BE.json
+++ b/gui/locale/fr_BE.json
@@ -2096,6 +2096,12 @@
           "label": "Éclat",
           "placeholder": "Sélectionnez le relais optionnel pour le flash"
         },
+        "history": {
+          "help": "Entrez le nombre de jours à conserver pour l'historique.",
+          "invalid": "Veuillez saisir une valeur minimale de {value}.",
+          "label": "Historique des archives en jours",
+          "placeholder": "Entrez le numéro"
+        },
         "light": {
           "help": "État lumineux pour prendre une image d'archive.",
           "invalid": "Veuillez faire un choix.",
@@ -2110,7 +2116,7 @@
         "options": {
           "day_1": "1 jour",
           "disabled": "Désactivé",
-          "hour_1": "30 minutes",
+          "hour_1": "1 heure",
           "hour_12": "12 heures",
           "hour_3": "Heures maximales de lumières",
           "hour_6": "Heures maximales de lumières",
diff --git a/gui/locale/it_IT.json b/gui/locale/it_IT.json
index 2ccb10fb5..63355355b 100644
--- a/gui/locale/it_IT.json
+++ b/gui/locale/it_IT.json
@@ -2096,6 +2096,12 @@
           "label": "flash",
           "placeholder": "Seleziona il relè opzionale per il flash"
         },
+        "history": {
+          "help": "Inserisci il numero di giorni da conservare per la cronologia.",
+          "invalid": "Inserisci un valore minimo di {value}.",
+          "label": "Archivia la cronologia in giorni",
+          "placeholder": "Inserisci il numero"
+        },
         "light": {
           "help": "Stato della luce per acquisire un'immagine di archivio.",
           "invalid": "Per favore, fai una scelta.",
@@ -2110,7 +2116,7 @@
         "options": {
           "day_1": "1 giorno",
           "disabled": "Disabilitato",
-          "hour_1": "30 minuti",
+          "hour_1": "1 ora",
           "hour_12": "12 ore",
           "hour_3": "3 ore",
           "hour_6": "6 ore",
diff --git a/gui/locale/ja.json b/gui/locale/ja.json
index 899880f38..f92f5effd 100644
--- a/gui/locale/ja.json
+++ b/gui/locale/ja.json
@@ -2096,6 +2096,12 @@
           "label": "フラッシュ",
           "placeholder": "フラッシュ用のオプションのリレーを選択します"
         },
+        "history": {
+          "help": "履歴を保存する日数を入力します。",
+          "invalid": "最小値 {value} を入力してください。",
+          "label": "履歴を数日でアーカイブする",
+          "placeholder": "番号を入力してください"
+        },
         "light": {
           "help": "アーカイブ画像を取得するためのライトステータス。.",
           "invalid": "選択してください。.",
@@ -2110,7 +2116,7 @@
         "options": {
           "day_1": "1日",
           "disabled": "無効",
-          "hour_1": "30分",
+          "hour_1": "1時間",
           "hour_12": "12時間",
           "hour_3": "3時間",
           "hour_6": "6時間",
diff --git a/gui/locale/nb_NO.json b/gui/locale/nb_NO.json
index baef237d2..d8470e053 100644
--- a/gui/locale/nb_NO.json
+++ b/gui/locale/nb_NO.json
@@ -2096,6 +2096,12 @@
           "label": "Blits",
           "placeholder": "Velg valgfritt relé for blits"
         },
+        "history": {
+          "help": "Angi antall dager som skal lagres for historikk.",
+          "invalid": "Angi en minimumsverdi på {value}.",
+          "label": "Arkivhistorie i dager",
+          "placeholder": "Skriv inn nummer"
+        },
         "light": {
           "help": "Lysstatus for å ta et arkivbilde.",
           "invalid": "Vennligst ta et valg.",
@@ -2110,7 +2116,7 @@
         "options": {
           "day_1": "1 dag",
           "disabled": "Deaktivert",
-          "hour_1": "30 minutter",
+          "hour_1": "1 time",
           "hour_12": "12 timer",
           "hour_3": "3 timer",
           "hour_6": "6 timer",
diff --git a/gui/locale/nl_NL.json b/gui/locale/nl_NL.json
index 6b6d20bc8..66cf05c64 100644
--- a/gui/locale/nl_NL.json
+++ b/gui/locale/nl_NL.json
@@ -2096,6 +2096,12 @@
           "label": "Flits",
           "placeholder": "Selecteer optionele schakelaar voor flits"
         },
+        "history": {
+          "help": "Voer het aantal dagen in dat u wilt bewaren voor de geschiedenis.",
+          "invalid": "Voer een minimumwaarde van {value} in.",
+          "label": "Archiefgeschiedenis in dagen",
+          "placeholder": "Voer nummer in"
+        },
         "light": {
           "help": "Lichtstatus voor het maken van een archiefbeeld.",
           "invalid": "Maak een keuze.",
@@ -2110,7 +2116,7 @@
         "options": {
           "day_1": "1 dag",
           "disabled": "Gedeactiveerd",
-          "hour_1": "30 minuten",
+          "hour_1": "1 uur",
           "hour_12": "12 uren",
           "hour_3": "3 uren",
           "hour_6": "6 uren",
diff --git a/gui/locale/pl.json b/gui/locale/pl.json
index 5d849d38b..aca4883f3 100644
--- a/gui/locale/pl.json
+++ b/gui/locale/pl.json
@@ -2096,6 +2096,12 @@
           "label": "Błysk",
           "placeholder": "Wybierz opcjonalny przekaźnik Flash"
         },
+        "history": {
+          "help": "Wprowadź liczbę dni, które mają być przechowywane w historii.",
+          "invalid": "Proszę wprowadzić minimalną wartość {value}.",
+          "label": "Archiwizuj historię w dniach",
+          "placeholder": "Wpisz numer"
+        },
         "light": {
           "help": "Status światła do wykonania obrazu archiwum.",
           "invalid": "Dokonaj wyboru.",
@@ -2110,7 +2116,7 @@
         "options": {
           "day_1": "1 dzień",
           "disabled": "Wyłączony",
-          "hour_1": "30 minut",
+          "hour_1": "1 godzina",
           "hour_12": "12 godzin",
           "hour_3": "3 godziny",
           "hour_6": "6 godzin",
diff --git a/gui/locale/pt.json b/gui/locale/pt.json
index 2000f9174..6d3503ffb 100644
--- a/gui/locale/pt.json
+++ b/gui/locale/pt.json
@@ -2096,6 +2096,11 @@
           "label": "Flash",
           "placeholder": "Seleccione o relé opcional para flash"
         },
+        "history": {
+          "help": "Insira a quantidade de dias a serem mantidos no histórico.",
+          "invalid": "Insira um valor mínimo de {value}.",
+          "placeholder": "Digite o número"
+        },
         "light": {
           "help": "Estado das luzes para guardar uma imagem no arquivo.",
           "invalid": "Por favor seleccione uma opção.",
diff --git a/gui/locale/pt_BR.json b/gui/locale/pt_BR.json
index b9f43cac4..a4c28d8a6 100644
--- a/gui/locale/pt_BR.json
+++ b/gui/locale/pt_BR.json
@@ -2096,6 +2096,9 @@
           "label": "Flash",
           "placeholder": "Selecione o relé opcional para o flash"
         },
+        "history": {
+          "label": "Arquivar histórico em dias"
+        },
         "light": {
           "help": "Estado das luzes para salvar uma imagem em arquivo.",
           "invalid": "Por favor, faça uma escolha.",
@@ -2110,7 +2113,7 @@
         "options": {
           "day_1": "1 dia",
           "disabled": "Desativado",
-          "hour_1": "30 minutos",
+          "hour_1": "1 hora",
           "hour_12": "12 horas",
           "hour_3": "3 horas",
           "hour_6": "6 horas",
diff --git a/gui/modals/WebcamFormModal.svelte b/gui/modals/WebcamFormModal.svelte
index 94e207238..a27b5bb04 100644
--- a/gui/modals/WebcamFormModal.svelte
+++ b/gui/modals/WebcamFormModal.svelte
@@ -32,6 +32,7 @@
   let webcamMap = null;
 
   let motion_settings = false; // Calibration is always enabled due to offset setting
+  let archive_settings = false;
   let hardware_type = null;
   let formData = writable({});
 
@@ -68,7 +69,7 @@
     { value: '300', text: $_('webcams.settings.archive.options.minute_5', { default: '5 Minutes' }) },
     { value: '900', text: $_('webcams.settings.archive.options.minute_15', { default: '15 Minutes' }) },
     { value: '1800', text: $_('webcams.settings.archive.options.minute_30', { default: '30 Minutes' }) },
-    { value: '3600', text: $_('webcams.settings.archive.options.hour_1', { default: 'Disabled' }) },
+    { value: '3600', text: $_('webcams.settings.archive.options.hour_1', { default: '1 Hour' }) },
     { value: '10800', text: $_('webcams.settings.archive.options.hour_3', { default: '3 Hours' }) },
     { value: '21600', text: $_('webcams.settings.archive.options.hour_6', { default: '6 Hours' }) },
     { value: '43200', text: $_('webcams.settings.archive.options.hour_12', { default: '12 Hours' }) },
@@ -197,6 +198,7 @@
 
   const archivingCalibration = (state) => {
     motion_settings = state === 'motion';
+    archive_settings = motion_settings || (state && state !== 'disabled');
   };
 
   const _processForm = async (values, context) => {
@@ -428,7 +430,7 @@
           </div>
         </div>
         <div class="row">
-          <div class="col-6 col-sm-6 col-md-3 col-lg-3">
+          <div class="col-6 col-sm-6 col-md-6 col-lg-6">
             <Select
               name="archive.state"
               value="{$formData.archive ? $formData.archive.state : null}"
@@ -442,41 +444,7 @@
               invalid="{$_('webcams.settings.archive.state.invalid', { default: 'Please make a choice.' })}"
             />
           </div>
-          <div class="col-6 col-sm-6 col-md-3 col-lg-3">
-            <Select
-              name="archive.light"
-              value="{$formData.archive ? $formData.archive.light : ''}"
-              options="{[
-                { value: 'ignore', text: $_('webcams.settings.archive.light.options.ignore', { default: 'Ignore' }) },
-                { value: 'on', text: $_('webcams.settings.archive.light.options.on', { default: 'When on' }) },
-                { value: 'off', text: $_('webcams.settings.archive.light.options.off', { default: 'When off' }) },
-              ]}"
-              label="{$_('webcams.settings.archive.light.label', { default: 'Archive light state' })}"
-              placeholder="{$_('webcams.settings.archive.light.placeholder', {
-                default: 'Select archive light state',
-              })}"
-              help="{$_('webcams.settings.archive.light.help', {
-                default: 'Light status for taking an archive image.',
-              })}"
-              invalid="{$_('webcams.settings.archive.light.invalid', { default: 'Please make a choice.' })}"
-            />
-          </div>
-          <div class="col-6 col-sm-6 col-md-3 col-lg-3">
-            <Select
-              name="archive.door"
-              value="{$formData.archive ? $formData.archive.door : ''}"
-              options="{[
-                { value: 'ignore', text: $_('webcams.settings.archive.door.options.ignore', { default: 'Ignore' }) },
-                { value: 'close', text: $_('webcams.settings.archive.door.options.close', { default: 'Close' }) },
-                { value: 'open', text: $_('webcams.settings.archive.door.options.open', { default: 'Open' }) },
-              ]}"
-              label="{$_('webcams.settings.archive.door.label', { default: 'Archive door state' })}"
-              placeholder="{$_('webcams.settings.archive.door.placeholder', { default: 'Select archive door state' })}"
-              help="{$_('webcams.settings.archive.door.help', { default: 'Door status for taking an archive image.' })}"
-              invalid="{$_('webcams.settings.archive.door.invalid', { default: 'Please make a choice.' })}"
-            />
-          </div>
-          <div class="col-6 col-sm-6 col-md-3 col-lg-3">
+          <div class="col-6 col-sm-6 col-md-6 col-lg-6">
             <Select
               name="flash"
               value="{$formData.flash}"
@@ -513,6 +481,59 @@
         </div>
       </div>
     </div>
+    <div class="row" class:d-none="{!archive_settings}">
+      <div class="col-6 col-sm-6 col-md-3 col-lg-3">
+        <Select
+          name="archive.light"
+          value="{$formData.archive ? $formData.archive.light : ''}"
+          options="{[
+            { value: 'ignore', text: $_('webcams.settings.archive.light.options.ignore', { default: 'Ignore' }) },
+            { value: 'on', text: $_('webcams.settings.archive.light.options.on', { default: 'When on' }) },
+            { value: 'off', text: $_('webcams.settings.archive.light.options.off', { default: 'When off' }) },
+          ]}"
+          label="{$_('webcams.settings.archive.light.label', { default: 'Archive light state' })}"
+          placeholder="{$_('webcams.settings.archive.light.placeholder', {
+            default: 'Select archive light state',
+          })}"
+          help="{$_('webcams.settings.archive.light.help', {
+            default: 'Light status for taking an archive image.',
+          })}"
+          invalid="{$_('webcams.settings.archive.light.invalid', { default: 'Please make a choice.' })}"
+        />
+      </div>
+      <div class="col-6 col-sm-6 col-md-3 col-lg-3">
+        <Select
+          name="archive.door"
+          value="{$formData.archive ? $formData.archive.door : ''}"
+          options="{[
+            { value: 'ignore', text: $_('webcams.settings.archive.door.options.ignore', { default: 'Ignore' }) },
+            { value: 'close', text: $_('webcams.settings.archive.door.options.close', { default: 'Close' }) },
+            { value: 'open', text: $_('webcams.settings.archive.door.options.open', { default: 'Open' }) },
+          ]}"
+          label="{$_('webcams.settings.archive.door.label', { default: 'Archive door state' })}"
+          placeholder="{$_('webcams.settings.archive.door.placeholder', { default: 'Select archive door state' })}"
+          help="{$_('webcams.settings.archive.door.help', { default: 'Door status for taking an archive image.' })}"
+          invalid="{$_('webcams.settings.archive.door.invalid', { default: 'Please make a choice.' })}"
+        />
+      </div>
+      <div class="col-6 col-sm-6 col-md-3 col-lg-3">
+        <Field
+          type="number"
+          name="archive.history"
+          step="1"
+          min="0"
+          label="{$_('webcams.settings.archive.history.label', { default: 'Archive history in days' })}"
+          placeholder="{$_('webcams.settings.archive.history.placeholder', { default: 'Enter number' })}"
+          help="{$_('webcams.settings.archive.history.help', {
+            default: 'Enter the amount of days to keep for history.',
+          })}"
+          invalid="{$_('webcams.settings.archive.history.invalid', {
+            default: 'Please enter a minimum value of {value}.',
+            values: { value: 0 },
+          })}"
+        />
+      </div>
+    </div>
     <div class="row" class:d-none="{!motion_settings}">
       <div class="col-6 col-sm-6 col-md-3 col-lg-3">
         <Select