diff --git a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
index 8c100fb09..9c4f4e2d2 100644
--- a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
+++ b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
@@ -2,18 +2,23 @@
 	import { formFieldProxy } from 'sveltekit-superforms/client';
 	import { localItems, toCamelCase } from '$lib/utils/locales';
 	import { languageTag } from '$paraglide/runtime';
+	import { onMount } from 'svelte';
+	import { formSubmittedStore } from '$lib/utils/stores';
 
 	export let label: string | undefined = undefined;
 	export let field: string;
 	export let helpText: string | undefined = undefined;
 
 	export let form;
+	export let origin: string;
+	export let URLModel: string;
 	export let multiple = false;
 	export let nullable = false;
 
 	export let hide = false;
 
 	const { value, errors, constraints } = formFieldProxy(form, field);
+	const dataSaving = origin === "create";
 
 	export let options: { label: string; value: string; suggested?: boolean }[];
 
@@ -28,6 +33,32 @@
 
 	$: selectedValues = selected.map((item) => item.value);
 
+	let _sessionStorage = null;
+	onMount(() => {
+		if (!dataSaving) return;
+		_sessionStorage = sessionStorage;
+		const savedData = JSON.parse(_sessionStorage.getItem("create_form_saved_data") ?? "{}");
+		const currentData = savedData[URLModel];
+		if (currentData) {
+			const savedValue = currentData[field];
+			if (savedValue) {
+				selected = savedValue;
+			}
+		}
+	});
+
+	$: if (dataSaving && _sessionStorage && !$formSubmittedStore) {
+		const savedData = JSON.parse(_sessionStorage.getItem("create_form_saved_data") ?? "{}");
+
+		const currentData = savedData[URLModel] ?? {};
+		if (!sessionStorage.hasOwnProperty(URLModel)) {
+			currentData[field] = selected;
+		}
+		savedData[URLModel] = currentData;
+
+		_sessionStorage.setItem("create_form_saved_data",JSON.stringify(savedData));
+	}
+
 	const default_value = nullable ? null : selectedValues[0];
 
 	$: ($value = multiple ? selectedValues : selectedValues[0] ?? default_value), handleSelectChange();
diff --git a/frontend/src/lib/components/Forms/Form.svelte b/frontend/src/lib/components/Forms/Form.svelte
index 789fbaa40..827427a33 100644
--- a/frontend/src/lib/components/Forms/Form.svelte
+++ b/frontend/src/lib/components/Forms/Form.svelte
@@ -4,6 +4,8 @@
 	import SuperDebug from 'sveltekit-superforms/client/SuperDebug.svelte';
 	import type { AnyZodObject } from 'zod';
 	import { focusTrap } from '@skeletonlabs/skeleton';
+	import { onMount } from 'svelte';
+	import { formSubmittedStore } from '$lib/utils/stores';
 
 	import type { ModalStore } from '@skeletonlabs/skeleton';
 	import { getModalStore } from '@skeletonlabs/skeleton';
@@ -14,12 +16,15 @@
 
 	export let data: SuperValidated<AnyZodObject>;
 	export let dataType: 'form' | 'json';
+	export let origin: String;
+	export let URLModel: string;
 	export let invalidateAll = true; // set to false to keep form data using muliple forms on a page
 	export let validators: AnyZodObject;
 	export let applyAction = true;
 	export let resetForm = false;
 	export let onSubmit = (submit_data: any) => {};
 	export let taintedMessage: string | null = m.taintedFormMessage();
+	const dataSaving = origin === "create";
 
 	export let debug = false; // set to true to enable SuperDebug component
 
@@ -41,6 +46,13 @@
 	});
 
 	const { form, message /*, tainted*/, delayed, errors, allErrors, enhance } = _form;
+
+	let _sessionStorage = null;
+	onMount(() => {
+		_sessionStorage = sessionStorage;
+	})
+
+	$: if (URLModel) { formSubmittedStore.set(false); }
 </script>
 
 {#if debug}
@@ -48,7 +60,14 @@
 	<SuperDebug data={$errors} />
 {/if}
 
-<form method="POST" use:enhance use:focusTrap={true} {...$$restProps}>
+<form method="POST" on:submit={() => {
+	if (dataSaving) {
+		formSubmittedStore.set(true);
+		const savedData = JSON.parse(_sessionStorage?.getItem("create_form_saved_data") ?? "{}");
+		savedData[URLModel] = {};
+		_sessionStorage?.setItem("create_form_saved_data",JSON.stringify(savedData));
+	}
+}} use:enhance use:focusTrap={true} {...$$restProps}>
 	{#if $errors._errors}
 		{#each $errors._errors as error}
 			<p class="text-error-500 text-sm font-medium">{error}</p>
diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index 39c325b04..d2113fcbb 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -55,6 +55,8 @@
 	dataType={shape.attachment ? 'form' : 'json'}
 	enctype={shape.attachment ? 'multipart/form-data' : 'application/x-www-form-urlencoded'}
 	data={form}
+	{origin}
+	{URLModel}
 	let:form
 	let:data
 	let:initialData
@@ -97,22 +99,22 @@
 		/>
 	{/if}
 	{#if shape.name}
-		<TextField {form} field="name" label={m.name()} data-focusindex="0"/>
+		<TextField {form} {origin} {URLModel} field="name" label={m.name()} data-focusindex="0"/>
 	{/if}
 	{#if shape.description}
-		<TextArea {form} field="description" label={m.description()} data-focusindex="1"/>
+		<TextArea {form} {origin} {URLModel} field="description" label={m.description()} data-focusindex="1"/>
 	{/if}
 	{#if URLModel === 'projects'}
 		<AutocompleteSelect
-			{form}
+			{form} {origin} {URLModel}
 			options={getOptions({ objects: model.foreignKeys['folder'] })}
 			field="folder"
 			label={m.domain()}
 			hide={initialData.folder}
 		/>
-		<TextField {form} field="internal_reference" label={m.internalReference()} />
+		<TextField {form} {origin} {URLModel} field="internal_reference" label={m.internalReference()} />
 		<Select
-			{form}
+			{form} {origin} {URLModel}
 			options={model.selectOptions['lc_status']}
 			field="lc_status"
 			label={m.lcStatus()}
@@ -128,8 +130,8 @@
 			label={m.project()}
 			hide={initialData.project}
 		/>
-		<TextField {form} field="version" label={m.version()} />
-		<Select {form} options={model.selectOptions['status']} field="status" label={m.status()} />
+		<TextField {form} {origin} {URLModel} field="version" label={m.version()} />
+		<Select {form} {origin} {URLModel} options={model.selectOptions['status']} field="status" label={m.status()} />
 		<AutocompleteSelect
 			{form}
 			options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
@@ -151,16 +153,16 @@
 			field="reviewers"
 			label={m.reviewers()}
 		/>
-		<TextField type="date" {form} field="eta" label={m.eta()} helpText={m.etaHelpText()} />
+		<TextField type="date" {form} {origin} {URLModel} field="eta" label={m.eta()} helpText={m.etaHelpText()} />
 		<TextField
 			type="date"
-			{form}
+			{form} {origin} {URLModel}
 			field="due_date"
 			label={m.dueDate()}
 			helpText={m.dueDateHelpText()}
 		/>
 	{:else if URLModel === 'threats'}
-		<TextField {form} field="ref_id" label={m.ref()} />
+		<TextField {form} {origin} {URLModel} field="ref_id" label={m.ref()} />
 		<AutocompleteSelect
 			{form}
 			options={getOptions({ objects: model.foreignKeys['folder'] })}
@@ -168,7 +170,7 @@
 			label={m.domain()}
 			hide={initialData.folder}
 		/>
-		<TextField {form} field="provider" label={m.provider()} />
+		<TextField {form} {origin} {URLModel} field="provider" label={m.provider()} />
 	{:else if URLModel === 'risk-scenarios'}
 		<AutocompleteSelect
 			{form}
@@ -193,13 +195,13 @@
 	{:else if URLModel === 'applied-controls' || URLModel === 'policies'}
 		{#if schema.shape.category}
 			<Select
-				{form}
+				{form} {origin} {URLModel}
 				options={model.selectOptions['category']}
 				field="category"
 				label={m.category()}
 			/>
 		{/if}
-		<Select {form} options={model.selectOptions['status']} field="status" label={m.status()} />
+		<Select {form} {origin} {URLModel} options={model.selectOptions['status']} field="status" label={m.status()} />
 		<AutocompleteSelect
 			{form}
 			multiple
@@ -210,17 +212,17 @@
 			field="evidences"
 			label={m.evidences()}
 		/>
-		<TextField type="date" {form} field="eta" label={m.eta()} helpText={m.etaHelpText()} />
+		<TextField type="date" {form} {origin} {URLModel} field="eta" label={m.eta()} helpText={m.etaHelpText()} />
 		<TextField
 			type="date"
-			{form}
+			{form} {origin} {URLModel}
 			field="expiry_date"
 			label={m.expiryDate()}
 			helpText={m.expiryDateHelpText()}
 		/>
-		<TextField {form} field="link" label={m.link()} helpText={m.linkHelpText()} />
+		<TextField {form} {origin} {URLModel} field="link" label={m.link()} helpText={m.linkHelpText()} />
 		<Select
-			{form}
+			{form} {origin} {URLModel}
 			options={model.selectOptions['effort']}
 			field="effort"
 			label={m.effort()}
@@ -235,7 +237,7 @@
 		/>
 	{:else if URLModel === 'risk-acceptances'}
 		<TextField
-			{form}
+			{form} {origin} {URLModel}
 			type="date"
 			field="expiry_date"
 			label={m.expiryDate()}
@@ -244,7 +246,7 @@
 		{#if object.id && $page.data.user.id === object.approver}
 			<TextArea
 				disabled={$page.data.user.id !== object.approver}
-				{form}
+				{form} {origin} {URLModel}
 				field="justification"
 				label={m.justification()}
 				helpText={m.riskAcceptanceJusitficationHelpText()}
@@ -276,14 +278,14 @@
 			multiple
 		/>
 	{:else if URLModel === 'reference-controls'}
-		<TextField {form} field="ref_id" label={m.ref()} />
+		<TextField {form} {origin} {URLModel} field="ref_id" label={m.ref()} />
 		<Select
-			{form}
+			{form} {origin} {URLModel}
 			options={model.selectOptions['category']}
 			field="category"
 			label={m.category()}
 		/>
-		<TextField {form} field="provider" label={m.provider()} />
+		<TextField {form} {origin} {URLModel} field="provider" label={m.provider()} />
 		<AutocompleteSelect
 			{form}
 			options={getOptions({ objects: model.foreignKeys['folder'] })}
@@ -309,7 +311,7 @@
 			label={m.domain()}
 			hide={initialData.applied_controls || initialData.requirement_assessments}
 		/>
-		<TextField {form} field="link" label={m.link()} helpText={m.linkHelpText()} />
+		<TextField {form} {origin} {URLModel} field="link" label={m.link()} helpText={m.linkHelpText()} />
 	{:else if URLModel === 'compliance-assessments'}
 		<AutocompleteSelect
 			{form}
@@ -321,8 +323,8 @@
 			label={m.project()}
 			hide={initialData.project}
 		/>
-		<TextField {form} field="version" label={m.version()} />
-		<Select {form} options={model.selectOptions['status']} field="status" label={m.status()} />
+		<TextField {form} {origin} {URLModel} field="version" label={m.version()} />
+		<Select {form} {origin} {URLModel} options={model.selectOptions['status']} field="status" label={m.status()} />
 		<AutocompleteSelect
 			{form}
 			options={getOptions({ objects: model.foreignKeys['framework'] })}
@@ -343,16 +345,16 @@
 			field="reviewers"
 			label={m.reviewers()}
 		/>
-		<TextField type="date" {form} field="eta" label={m.eta()} helpText={m.etaHelpText()} />
+		<TextField type="date" {form} {origin} {URLModel} field="eta" label={m.eta()} helpText={m.etaHelpText()} />
 		<TextField
 			type="date"
-			{form}
+			{form} {origin} {URLModel}
 			field="due_date"
 			label={m.dueDate()}
 			helpText={m.dueDateHelpText()}
 		/>
 	{:else if URLModel === 'assets'}
-		<TextArea {form} field="business_value" label={m.businessValue()} />
+		<TextArea {form} {origin} {URLModel} field="business_value" label={m.businessValue()} />
 		<AutocompleteSelect
 			{form}
 			options={getOptions({ objects: model.foreignKeys['folder'] })}
@@ -360,7 +362,7 @@
 			label={m.domain()}
 			hide={initialData.folder}
 		/>
-		<Select {form} options={model.selectOptions['type']} field="type" label="Type" />
+		<Select {form} {origin} {URLModel} options={model.selectOptions['type']} field="type" label="Type" />
 		<AutocompleteSelect
 			disabled={data.type === 'PR'}
 			multiple
@@ -370,16 +372,16 @@
 			label={m.parentAssets()}
 		/>
 	{:else if URLModel === 'requirement-assessments'}
-		<Select {form} options={model.selectOptions['status']} field="status" label={m.status()} />
-		<TextArea {form} field="observation" label={m.observation()} />
+		<Select {form} {origin} {URLModel} options={model.selectOptions['status']} field="status" label={m.status()} />
+		<TextArea {form} {origin} {URLModel} field="observation" label={m.observation()} />
 		<HiddenInput {form} field="folder" />
 		<HiddenInput {form} field="requirement" />
 		<HiddenInput {form} field="compliance_assessment" />
 	{:else if URLModel === 'users'}
-		<TextField {form} field="email" label={m.email()} data-focusindex="2"/>
+		<TextField {form} {origin} {URLModel} field="email" label={m.email()} data-focusindex="2"/>
 		{#if shape.first_name && shape.last_name}
-			<TextField {form} field="first_name" label={m.firstName()} />
-			<TextField {form} field="last_name" label={m.lastName()} />
+			<TextField {form} {origin} {URLModel} field="first_name" label={m.firstName()} />
+			<TextField {form} {origin} {URLModel} field="last_name" label={m.lastName()} />
 		{/if}
 		{#if shape.user_groups}
 			<AutocompleteSelect
diff --git a/frontend/src/lib/components/Forms/Select.svelte b/frontend/src/lib/components/Forms/Select.svelte
index 8a4e8505b..ccfc941dc 100644
--- a/frontend/src/lib/components/Forms/Select.svelte
+++ b/frontend/src/lib/components/Forms/Select.svelte
@@ -3,6 +3,8 @@
 	import { localItems, toCamelCase } from '$lib/utils/locales';
 	import { languageTag } from '$paraglide/runtime';
 	import type { AnyZodObject } from 'zod';
+	import { onMount } from 'svelte';
+	import { formSubmittedStore } from '$lib/utils/stores';
 
 	let _class = '';
 
@@ -14,8 +16,11 @@
 	export let color_map = {};
 
 	export let form: SuperForm<AnyZodObject>;
+	export let origin: string;
+	export let URLModel: string;
 
 	const { value, errors, constraints } = formFieldProxy(form, field);
+	const dataSaving = origin === "create";
 
 	interface Option {
 		label: unknown;
@@ -26,6 +31,32 @@
 
 	$: classesTextField = (errors: string[] | undefined) =>
 		errors && errors.length > 0 ? 'input-error' : '';
+
+	let _sessionStorage = null;
+	onMount(() => {
+		if (!dataSaving) return;
+		_sessionStorage = sessionStorage;
+		const savedData = JSON.parse(_sessionStorage.getItem("create_form_saved_data") ?? "{}");
+		const currentData = savedData[URLModel];
+		if (currentData) {
+			const savedValue = currentData[field];
+			if (savedValue) {
+				value.set(savedValue);
+			}
+		}
+	});
+
+	$: if (dataSaving && _sessionStorage && !$formSubmittedStore) {
+		const savedData = JSON.parse(_sessionStorage.getItem("create_form_saved_data") ?? "{}");
+
+		const currentData = savedData[URLModel] ?? {};
+		if (!sessionStorage.hasOwnProperty(URLModel)) {
+			currentData[field] = $value;
+		}
+		savedData[URLModel] = currentData;
+
+		_sessionStorage.setItem("create_form_saved_data",JSON.stringify(savedData));
+	}
 </script>
 
 <div>
diff --git a/frontend/src/lib/components/Forms/TextArea.svelte b/frontend/src/lib/components/Forms/TextArea.svelte
index 5d927a7cd..82baf19e3 100644
--- a/frontend/src/lib/components/Forms/TextArea.svelte
+++ b/frontend/src/lib/components/Forms/TextArea.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
 	import type { CssClasses } from '@skeletonlabs/skeleton';
 	import { formFieldProxy } from 'sveltekit-superforms/client';
+	import { onMount } from 'svelte';
+	import { formSubmittedStore } from '$lib/utils/stores';
 
 	let _class = '';
 
@@ -10,10 +12,40 @@
 	export let field: string;
 	export let helpText: string | undefined = undefined;
 	export let form;
+	export let origin: string;
+	export let URLModel: string;
 
 	const { value, errors, constraints } = formFieldProxy(form, field);
+	const dataSaving = origin === "create";
 
 	$: classesTextField = (errors: string[] | undefined) => (errors ? 'input-error' : '');
+
+	let _sessionStorage = null;
+	onMount(() => {
+		if (!dataSaving) return;
+		_sessionStorage = sessionStorage;
+		const savedData = JSON.parse(_sessionStorage.getItem("create_form_saved_data") ?? "{}");
+		const currentData = savedData[URLModel];
+		if (currentData) {
+			const savedValue = currentData[field];
+			if (savedValue) {
+				value.set(savedValue);
+			}
+		}
+	});
+
+
+	$: if (dataSaving && _sessionStorage && !$formSubmittedStore) {
+		const savedData = JSON.parse(_sessionStorage.getItem("create_form_saved_data") ?? "{}");
+
+		const currentData = savedData[URLModel] ?? {};
+		if (!sessionStorage.hasOwnProperty(URLModel)) {
+			currentData[field] = $value;
+		}
+		savedData[URLModel] = currentData;
+
+		_sessionStorage.setItem("create_form_saved_data",JSON.stringify(savedData));
+	}
 </script>
 
 <div class={regionContainer}>
diff --git a/frontend/src/lib/components/Forms/TextField.svelte b/frontend/src/lib/components/Forms/TextField.svelte
index 2f1d0f581..39a8c95f3 100644
--- a/frontend/src/lib/components/Forms/TextField.svelte
+++ b/frontend/src/lib/components/Forms/TextField.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
 	import { formFieldProxy } from 'sveltekit-superforms/client';
+	import { onMount } from 'svelte';
+	import { formSubmittedStore } from '$lib/utils/stores';
 
 	let _class = '';
 
@@ -9,10 +11,39 @@
 	export let helpText: string | undefined = undefined;
 
 	export let form;
+	export let origin: string;
+	export let URLModel: string;
 
 	const { value, errors, constraints } = formFieldProxy(form, field);
+	const dataSaving = origin === "create";
 
 	$: classesTextField = (errors: string[] | undefined) => (errors ? 'input-error' : '');
+
+	let _sessionStorage = null;
+	onMount(() => {
+		if (!dataSaving) return;
+		_sessionStorage = sessionStorage;
+		const savedData = JSON.parse(_sessionStorage.getItem("create_form_saved_data") ?? "{}");
+		const currentData = savedData[URLModel];
+		if (currentData) {
+			const savedValue = currentData[field];
+			if (savedValue) {
+				value.set(savedValue);
+			}
+		}
+	});
+
+	$: if (dataSaving && _sessionStorage && !$formSubmittedStore) {
+		const savedData = JSON.parse(_sessionStorage.getItem("create_form_saved_data") ?? "{}");
+
+		const currentData = savedData[URLModel] ?? {};
+		if (!sessionStorage.hasOwnProperty(URLModel)) {
+			currentData[field] = $value;
+		}
+		savedData[URLModel] = currentData;
+
+		_sessionStorage.setItem("create_form_saved_data",JSON.stringify(savedData));
+	}
 </script>
 
 <div>
diff --git a/frontend/src/lib/components/Modals/CreateModal.svelte b/frontend/src/lib/components/Modals/CreateModal.svelte
index 8d7fe949a..c7bd47290 100644
--- a/frontend/src/lib/components/Modals/CreateModal.svelte
+++ b/frontend/src/lib/components/Modals/CreateModal.svelte
@@ -42,6 +42,6 @@
 				<i class="fa-solid fa-xmark" />
 			</div>
 		</div>
-		<ModelForm {form} {suggestions} {parent} {model} {closeModal} action="?/{formAction}" {debug} />
+		<ModelForm {form} origin="create" {suggestions} {parent} {model} {closeModal} action="?/{formAction}" {debug}/>
 	</div>
 {/if}
diff --git a/frontend/src/lib/utils/stores.ts b/frontend/src/lib/utils/stores.ts
index 2eb597be8..bf69e11cf 100644
--- a/frontend/src/lib/utils/stores.ts
+++ b/frontend/src/lib/utils/stores.ts
@@ -10,3 +10,4 @@ showNotification.subscribe((val) => {
 
 export const breadcrumbObject = writable({ id: '', name: '', email: '' });
 export const pageTitle = writable('');
+export const formSubmittedStore = writable(false);