diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 1c2c88325..803985aa8 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -14,6 +14,7 @@
 	"addDomain": "New domain",
 	"addProject": "New project",
 	"addUser": "New user",
+	"addPolicy": "New policy",
 	"associatedThreats": "Associated threats",
 	"associatedSecurityFunctions": "Associated security functions",
 	"associatedSecurityMeasures": "Associated security measures",
@@ -42,6 +43,7 @@
 	"securityMeasures": "Security measures",
 	"assets": "Assets",
 	"asset": "Asset",
+	"policy": "Policy",
 	"policies": "Policies",
 	"riskMatrices": "Risk matrices",
 	"riskAssessments": "Risk assessments",
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
index d8cf2c16d..c0faee951 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -14,6 +14,7 @@
 	"addDomain": "Ajouter un domaine",
 	"addProject": "Ajouter un projet",
 	"addUser": "Ajouter un utilisateur",
+	"addPolicy": "Ajouter une politique",
 	"associatedThreats": "Menaces associées",
 	"associatedSecurityFunctions": "Fonctions de sécurité associées",
 	"associatedSecurityMeasures": "Mesures de sécurité associées",
@@ -42,6 +43,7 @@
 	"securityMeasures": "Mesures de sécurité",
 	"assets": "Biens sensibles",
 	"asset": "Bien sensible",
+	"policy": "Politique",
 	"policies": "Politiques",
 	"riskMatrices": "Matrices de risque",
 	"riskAssessments": "Évaluations de risque",
diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index a371870a8..1812ecd9b 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -61,7 +61,7 @@
 				suggestions: suggestions['security_function']
 			})}
 			field="security_function"
-			label="Security function"
+			label={m.securityFunction()}
 			on:change={async (e) => {
 				if (e.detail) {
 					await fetch(`/security-functions/${e.detail}`)
diff --git a/frontend/src/lib/components/Forms/Select.svelte b/frontend/src/lib/components/Forms/Select.svelte
index 3c0b13da0..ed218b494 100644
--- a/frontend/src/lib/components/Forms/Select.svelte
+++ b/frontend/src/lib/components/Forms/Select.svelte
@@ -55,8 +55,8 @@
 			{...$constraints}
 			{...$$restProps}
 		>
-			{#if !$constraints?.required}
-				<option value="">--</option>
+			{#if !$constraints?.required && !options.find((o) => o.label === '--')}
+				<option value={undefined} selected>--</option>
 			{/if}
 			{#each options as option}
 				<option value={option.value} style="background-color: {color_map[option.value]}"
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 7fa0fdddb..29a2b7206 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -190,6 +190,26 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'folder' }
 		]
 	},
+	policies: {
+		name: 'securitymeasure',
+		localName: 'policy',
+		localNamePlural: 'policies',
+		localFrGender: 'f',
+		verboseName: 'Policy',
+		verboseNamePlural: 'Policies',
+		foreignKeyFields: [
+			{ field: 'security_function', urlModel: 'security-functions' },
+			{ field: 'folder', urlModel: 'folders' },
+			{ field: 'evidences', urlModel: 'evidences' }
+		],
+		selectFields: [{ field: 'status' }, { field: 'effort' }],
+		filters: [
+			{ field: 'security_function' },
+			{ field: 'status' },
+			{ field: 'effort' },
+			{ field: 'folder' }
+		]
+	},
 	'risk-acceptances': {
 		name: 'riskacceptance',
 		localName: 'riskAcceptance',
diff --git a/frontend/src/lib/utils/locales.ts b/frontend/src/lib/utils/locales.ts
index 195c3d353..d375032ab 100644
--- a/frontend/src/lib/utils/locales.ts
+++ b/frontend/src/lib/utils/locales.ts
@@ -155,6 +155,7 @@ export function localItems(languageTag: string): LocalItems {
 		addDomain: m.addDomain({ languageTag: languageTag }),
 		addProject: m.addProject({ languageTag: languageTag }),
 		addUser: m.addUser({ languageTag: languageTag }),
+		addPolicy: m.addPolicy({ languageTag: languageTag }),
 		associatedThreats: m.associatedThreats({ languageTag: languageTag }),
 		associatedSecurityFunctions: m.associatedSecurityFunctions({ languageTag: languageTag }),
 		associatedSecurityMeasures: m.associatedSecurityMeasures({ languageTag: languageTag }),
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 902160d5d..7a6125ece 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -88,12 +88,12 @@ export const RiskScenarioSchema = baseNamedObject({
 
 export const SecurityMeasureSchema = baseNamedObject({
 	category: z.string().optional(),
-	status: z.string().optional(),
+	status: z.string().optional().nullable(),
 	evidences: z.string().optional().array().optional(),
 	eta: z.string().optional().nullable(),
 	expiry_date: z.string().optional().nullable(),
 	link: z.string().url().optional().nullable(),
-	effort: z.string().optional(),
+	effort: z.string().optional().nullable(),
 	folder: z.string(),
 	security_function: z.string().optional()
 });