diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte
index 95c826f50..839b0f2fe 100644
--- a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte
+++ b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte
@@ -6,10 +6,15 @@
     import { Button, Form, FormList, InputNumber, InputSwitch } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForConsole } from '$lib/stores/sdk';
+    import { onMount } from 'svelte';
     import { project } from '../../store';
 
     const projectId = $project.$id;
-    let passwordDictionary = $project.authPasswordDictionary ?? 0;
+    let passwordDictionary = $project.authPasswordDictionary ?? false;
+
+    onMount(() => {
+        passwordDictionary = $project.authPasswordDictionary ?? false;
+    });
 
     async function updatePasswordDictionary() {
         try {
@@ -56,7 +61,7 @@
                 used password. It uses <a
                     class="link"
                     href="https://github.com/danielmiessler/SecLists/blob/master/Passwords/Common-Credentials/10k-most-common.txt"
-                    >10 K most common passwords</a> list.
+                    >10K most common passwords</a> list.
             </p>
         </svelte:fragment>
 
diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte
index 2471c24e0..dcd1b9da6 100644
--- a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte
+++ b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte
@@ -4,13 +4,19 @@
     import { CardGrid, Heading } from '$lib/components';
     import { Dependencies } from '$lib/constants';
     import { Button, Form, InputNumber } from '$lib/elements/forms';
+    import FormList from '$lib/elements/forms/formList.svelte';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForConsole } from '$lib/stores/sdk';
+    import { onMount } from 'svelte';
     import { project } from '../../store';
 
     const projectId = $project.$id;
     let passwordHistory = $project.authPasswordHistory ?? 0;
 
+    onMount(() => {
+        passwordHistory = $project.authPasswordHistory ?? 0;
+    });
+
     async function updatePasswordHistoryLimit() {
         try {
             const path = '/projects/' + projectId + '/auth/password-history';
@@ -44,14 +50,19 @@
 <Form on:submit={updatePasswordHistoryLimit}>
     <CardGrid>
         <Heading tag="h2" size="6">Password History</Heading>
-        <p>
-            Maximum number of passwords saved per user. Use 0 to disable the password
+        <p class="text">
+            Maximum number of passwords saved per user. Maximum is 20. Use 0 to disable the password
             history.
         </p>
         <svelte:fragment slot="aside">
-            <ul>
-                <InputNumber id="max-session" label="Limit" bind:value={passwordHistory} />
-            </ul>
+            <FormList>
+                <InputNumber
+                    max={20}
+                    min={0}
+                    id="max-session"
+                    label="Limit"
+                    bind:value={passwordHistory} />
+            </FormList>
         </svelte:fragment>
 
         <svelte:fragment slot="actions">