diff --git a/src/routes/(console)/project-[region]-[project]/auth/security/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/+page.svelte
index 6c0ce4359..385cfe1f5 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/security/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/security/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Container } from '$lib/layout';
-    import { page } from '$app/state';
+    import type { PageProps } from './$types';
     import UpdateMockNumbers from './updateMockNumbers.svelte';
     import UpdateMembershipPrivacy from './updateMembershipPrivacy.svelte';
     import UpdateUsersLimit from './updateUsersLimit.svelte';
@@ -8,14 +8,16 @@
     import UpdateSessionsLimit from './updateSessionsLimit.svelte';
     import PasswordPolicies from './passwordPolicies.svelte';
     import SessionSecurity from './sessionSecurity.svelte';
+
+    let { data }: PageProps = $props();
 </script>
 
 <Container>
     <UpdateUsersLimit />
     <UpdateSessionLength />
     <UpdateSessionsLimit />
-    <PasswordPolicies project={page.data.project} />
-    <SessionSecurity project={page.data.project} />
+    <PasswordPolicies project={data.project} />
+    <SessionSecurity project={data.project} />
     <UpdateMockNumbers />
     <UpdateMembershipPrivacy />
 </Container>
diff --git a/src/routes/(console)/project-[region]-[project]/auth/security/passwordPolicies.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/passwordPolicies.svelte
index d57c73842..46547cecb 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/security/passwordPolicies.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/security/passwordPolicies.svelte
@@ -16,18 +16,29 @@
     let passwordHistoryEnabled = $state(false);
     let passwordDictionary = $state(false);
     let authPersonalDataCheck = $state(false);
+    let lastValidLimit = $state(5);
 
     let maxPasswordInputField: InputNumber | null = null;
 
     // Initialize and sync state when project updates
     $effect(() => {
         const historyValue = project?.authPasswordHistory;
-        passwordHistory = historyValue < 1 ? 5 : historyValue;
+        if (historyValue && historyValue > 0) {
+            passwordHistory = historyValue;
+            lastValidLimit = historyValue;
+        }
         passwordHistoryEnabled = (historyValue ?? 0) !== 0;
         passwordDictionary = project?.authPasswordDictionary ?? false;
         authPersonalDataCheck = project?.authPersonalDataCheck ?? false;
     });
 
+    // restore last valid limit when enabling
+    $effect(() => {
+        if (passwordHistoryEnabled && passwordHistory < 1) {
+            passwordHistory = lastValidLimit;
+        }
+    });
+
     $effect(() => {
         if (passwordHistoryEnabled) {
             tick().then(() => {