diff --git a/src/api/signalement/index.ts b/src/api/signalement/index.ts
index 66327d3..908af6d 100644
--- a/src/api/signalement/index.ts
+++ b/src/api/signalement/index.ts
@@ -8,23 +8,27 @@ export { OpenAPI } from './core/OpenAPI';
 export type { OpenAPIConfig } from './core/OpenAPI';
 
 export type { Author } from './models/Author';
-export type { AuthorDTO } from './models/AuthorDTO';
-export type { ChangesRequested } from './models/ChangesRequested';
+export type { AuthorInput } from './models/AuthorInput';
 export type { Client } from './models/Client';
 export type { CreateClientDTO } from './models/CreateClientDTO';
 export { CreateSignalementDTO } from './models/CreateSignalementDTO';
 export { CreateSourceDTO } from './models/CreateSourceDTO';
+export type { DeleteNumeroChangesRequestedDTO } from './models/DeleteNumeroChangesRequestedDTO';
 export { ExistingLocation } from './models/ExistingLocation';
 export { ExistingNumero } from './models/ExistingNumero';
 export { ExistingToponyme } from './models/ExistingToponyme';
 export { ExistingVoie } from './models/ExistingVoie';
-export type { ObjectId } from './models/ObjectId';
+export type { NumeroChangesRequestedDTO } from './models/NumeroChangesRequestedDTO';
 export type { PaginatedSignalementsDTO } from './models/PaginatedSignalementsDTO';
 export type { Point } from './models/Point';
 export { Position } from './models/Position';
+export type { PositionCoordinatesDTO } from './models/PositionCoordinatesDTO';
+export { PositionDTO } from './models/PositionDTO';
 export { Signalement } from './models/Signalement';
 export { Source } from './models/Source';
+export type { ToponymeChangesRequestedDTO } from './models/ToponymeChangesRequestedDTO';
 export { UpdateSignalementDTO } from './models/UpdateSignalementDTO';
+export type { VoieChangesRequestedDTO } from './models/VoieChangesRequestedDTO';
 
 export { ClientsService } from './services/ClientsService';
 export { SignalementsService } from './services/SignalementsService';
diff --git a/src/api/signalement/models/AuthorDTO.ts b/src/api/signalement/models/AuthorInput.ts
similarity index 75%
rename from src/api/signalement/models/AuthorDTO.ts
rename to src/api/signalement/models/AuthorInput.ts
index 81102c5..6369241 100644
--- a/src/api/signalement/models/AuthorDTO.ts
+++ b/src/api/signalement/models/AuthorInput.ts
@@ -2,8 +2,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-export type AuthorDTO = {
+export type AuthorInput = {
     email?: string | null;
-    captchaToken: string;
 };
 
diff --git a/src/api/signalement/models/ChangesRequested.ts b/src/api/signalement/models/ChangesRequested.ts
deleted file mode 100644
index 8462f81..0000000
--- a/src/api/signalement/models/ChangesRequested.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { Position } from './Position';
-export type ChangesRequested = {
-    numero?: number | null;
-    suffixe?: string | null;
-    positions?: Array<Position> | null;
-    parcelles?: Array<string> | null;
-    nomVoie?: string | null;
-    nom?: string | null;
-    comment?: string | null;
-};
-
diff --git a/src/api/signalement/models/Client.ts b/src/api/signalement/models/Client.ts
index 2683a42..c07fc54 100644
--- a/src/api/signalement/models/Client.ts
+++ b/src/api/signalement/models/Client.ts
@@ -2,12 +2,12 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { ObjectId } from './ObjectId';
 export type Client = {
-    _id: ObjectId;
-    _createdAt: number;
-    _updatedAt: number;
-    _deletedAt?: number | null;
+    id: string;
+    createdAt: string;
+    updatedAt: string;
+    deletedAt?: string | null;
     nom: string;
+    processedSignalements?: Array<string> | null;
 };
 
diff --git a/src/api/signalement/models/CreateSignalementDTO.ts b/src/api/signalement/models/CreateSignalementDTO.ts
index 26616fe..6b5986c 100644
--- a/src/api/signalement/models/CreateSignalementDTO.ts
+++ b/src/api/signalement/models/CreateSignalementDTO.ts
@@ -2,14 +2,20 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { AuthorDTO } from './AuthorDTO';
-import type { ExistingLocation } from './ExistingLocation';
+import type { AuthorInput } from './AuthorInput';
+import type { DeleteNumeroChangesRequestedDTO } from './DeleteNumeroChangesRequestedDTO';
+import type { ExistingNumero } from './ExistingNumero';
+import type { ExistingToponyme } from './ExistingToponyme';
+import type { ExistingVoie } from './ExistingVoie';
+import type { NumeroChangesRequestedDTO } from './NumeroChangesRequestedDTO';
+import type { ToponymeChangesRequestedDTO } from './ToponymeChangesRequestedDTO';
+import type { VoieChangesRequestedDTO } from './VoieChangesRequestedDTO';
 export type CreateSignalementDTO = {
     codeCommune: string;
     type: CreateSignalementDTO.type;
-    author?: AuthorDTO | null;
-    existingLocation?: ExistingLocation | null;
-    changesRequested: Record<string, any> | null;
+    author?: AuthorInput | null;
+    existingLocation?: (ExistingNumero | ExistingVoie | ExistingToponyme) | null;
+    changesRequested: (NumeroChangesRequestedDTO | DeleteNumeroChangesRequestedDTO | ToponymeChangesRequestedDTO | VoieChangesRequestedDTO) | null;
 };
 export namespace CreateSignalementDTO {
     export enum type {
diff --git a/src/api/signalement/models/ObjectId.ts b/src/api/signalement/models/DeleteNumeroChangesRequestedDTO.ts
similarity index 66%
rename from src/api/signalement/models/ObjectId.ts
rename to src/api/signalement/models/DeleteNumeroChangesRequestedDTO.ts
index 870bb6a..466d4f8 100644
--- a/src/api/signalement/models/ObjectId.ts
+++ b/src/api/signalement/models/DeleteNumeroChangesRequestedDTO.ts
@@ -2,6 +2,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-export type ObjectId = {
+export type DeleteNumeroChangesRequestedDTO = {
+    comment: string;
 };
 
diff --git a/src/api/signalement/models/NumeroChangesRequestedDTO.ts b/src/api/signalement/models/NumeroChangesRequestedDTO.ts
new file mode 100644
index 0000000..e07bb04
--- /dev/null
+++ b/src/api/signalement/models/NumeroChangesRequestedDTO.ts
@@ -0,0 +1,14 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { PositionDTO } from './PositionDTO';
+export type NumeroChangesRequestedDTO = {
+    numero: number;
+    suffixe?: string;
+    nomVoie: string;
+    parcelles: Array<string>;
+    positions: Array<PositionDTO>;
+    comment?: string | null;
+};
+
diff --git a/src/api/signalement/models/PaginatedSignalementsDTO.ts b/src/api/signalement/models/PaginatedSignalementsDTO.ts
index f9d79f2..1991095 100644
--- a/src/api/signalement/models/PaginatedSignalementsDTO.ts
+++ b/src/api/signalement/models/PaginatedSignalementsDTO.ts
@@ -2,9 +2,8 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { Signalement } from './Signalement';
 export type PaginatedSignalementsDTO = {
-    data: Array<Signalement>;
+    data: Array<any[]>;
     page: number;
     limit: number;
     total: number;
diff --git a/src/api/signalement/models/PositionCoordinatesDTO.ts b/src/api/signalement/models/PositionCoordinatesDTO.ts
new file mode 100644
index 0000000..e20b79e
--- /dev/null
+++ b/src/api/signalement/models/PositionCoordinatesDTO.ts
@@ -0,0 +1,9 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type PositionCoordinatesDTO = {
+    coordinates: Array<number>;
+    type: string;
+};
+
diff --git a/src/api/signalement/models/PositionDTO.ts b/src/api/signalement/models/PositionDTO.ts
new file mode 100644
index 0000000..fe95916
--- /dev/null
+++ b/src/api/signalement/models/PositionDTO.ts
@@ -0,0 +1,23 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { PositionCoordinatesDTO } from './PositionCoordinatesDTO';
+export type PositionDTO = {
+    point: PositionCoordinatesDTO;
+    type: PositionDTO.type;
+};
+export namespace PositionDTO {
+    export enum type {
+        ENTR_E = 'entrée',
+        B_TIMENT = 'bâtiment',
+        CAGE_D_ESCALIER = 'cage d’escalier',
+        LOGEMENT = 'logement',
+        SERVICE_TECHNIQUE = 'service technique',
+        D_LIVRANCE_POSTALE = 'délivrance postale',
+        PARCELLE = 'parcelle',
+        SEGMENT = 'segment',
+        INCONNUE = 'inconnue',
+    }
+}
+
diff --git a/src/api/signalement/models/Signalement.ts b/src/api/signalement/models/Signalement.ts
index a28addd..a06314c 100644
--- a/src/api/signalement/models/Signalement.ts
+++ b/src/api/signalement/models/Signalement.ts
@@ -3,25 +3,27 @@
 /* tslint:disable */
 /* eslint-disable */
 import type { Author } from './Author';
-import type { ChangesRequested } from './ChangesRequested';
 import type { Client } from './Client';
+import type { DeleteNumeroChangesRequestedDTO } from './DeleteNumeroChangesRequestedDTO';
 import type { ExistingNumero } from './ExistingNumero';
 import type { ExistingToponyme } from './ExistingToponyme';
 import type { ExistingVoie } from './ExistingVoie';
-import type { ObjectId } from './ObjectId';
+import type { NumeroChangesRequestedDTO } from './NumeroChangesRequestedDTO';
 import type { Source } from './Source';
+import type { ToponymeChangesRequestedDTO } from './ToponymeChangesRequestedDTO';
+import type { VoieChangesRequestedDTO } from './VoieChangesRequestedDTO';
 export type Signalement = {
-    _id: ObjectId;
-    _createdAt: number;
-    _updatedAt: number;
-    _deletedAt?: number | null;
+    id: string;
+    createdAt: string;
+    updatedAt: string;
+    deletedAt?: string | null;
     codeCommune: string;
     type: Signalement.type;
     author?: Author | null;
-    source: Source;
     existingLocation?: (ExistingNumero | ExistingVoie | ExistingToponyme) | null;
-    changesRequested: ChangesRequested;
+    changesRequested: (NumeroChangesRequestedDTO | DeleteNumeroChangesRequestedDTO | ToponymeChangesRequestedDTO | VoieChangesRequestedDTO);
     status?: Signalement.status | null;
+    source: Source;
     processedBy?: Client | null;
 };
 export namespace Signalement {
diff --git a/src/api/signalement/models/Source.ts b/src/api/signalement/models/Source.ts
index 1c0a90c..fc89213 100644
--- a/src/api/signalement/models/Source.ts
+++ b/src/api/signalement/models/Source.ts
@@ -2,14 +2,14 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { ObjectId } from './ObjectId';
 export type Source = {
-    _id: ObjectId;
-    _createdAt: number;
-    _updatedAt: number;
-    _deletedAt?: number | null;
+    id: string;
+    createdAt: string;
+    updatedAt: string;
+    deletedAt?: string | null;
     nom: string;
     type: Source.type;
+    signalements?: Array<string> | null;
 };
 export namespace Source {
     export enum type {
diff --git a/src/api/signalement/models/ToponymeChangesRequestedDTO.ts b/src/api/signalement/models/ToponymeChangesRequestedDTO.ts
new file mode 100644
index 0000000..01d2562
--- /dev/null
+++ b/src/api/signalement/models/ToponymeChangesRequestedDTO.ts
@@ -0,0 +1,12 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { PositionDTO } from './PositionDTO';
+export type ToponymeChangesRequestedDTO = {
+    nom: string;
+    parcelles: Array<string>;
+    positions: Array<PositionDTO>;
+    comment?: string | null;
+};
+
diff --git a/src/api/signalement/models/VoieChangesRequestedDTO.ts b/src/api/signalement/models/VoieChangesRequestedDTO.ts
new file mode 100644
index 0000000..ea4d91e
--- /dev/null
+++ b/src/api/signalement/models/VoieChangesRequestedDTO.ts
@@ -0,0 +1,9 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type VoieChangesRequestedDTO = {
+    nom: string;
+    comment?: string | null;
+};
+
diff --git a/src/api/signalement/services/SourcesService.ts b/src/api/signalement/services/SourcesService.ts
index 9d04cd5..66bceb9 100644
--- a/src/api/signalement/services/SourcesService.ts
+++ b/src/api/signalement/services/SourcesService.ts
@@ -58,4 +58,21 @@ export class SourcesService {
             },
         });
     }
+    /**
+     * Get source by token
+     * @param token
+     * @returns Source
+     * @throws ApiError
+     */
+    public static getSourceByToken(
+        token: string,
+    ): CancelablePromise<Source> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/sources/token/{token}',
+            path: {
+                'token': token,
+            },
+        });
+    }
 }
diff --git a/src/composants/authentification/AuthentificationModal.tsx b/src/composants/authentification/AuthentificationModal.tsx
new file mode 100644
index 0000000..2977a83
--- /dev/null
+++ b/src/composants/authentification/AuthentificationModal.tsx
@@ -0,0 +1,84 @@
+import React, { useContext, useState } from 'react'
+import Modal from '../common/Modal'
+import styled from 'styled-components'
+import SourceContext from '../../contexts/source.context'
+
+const StyledWrapper = styled.form`
+  .form-control {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+    margin-top: 20px;
+
+    > button:last-of-type {
+      margin-left: 10px;
+    }
+  }
+
+  .fr-alert {
+    margin-top: 20px;
+  }
+`
+
+interface AuthentificationModal {
+  onClose: () => void
+}
+
+export function AuthentificationModal({ onClose }: AuthentificationModal) {
+  const [token, setToken] = useState('')
+  const [submitStatus, setSubmitStatus] = useState<string | null>(null)
+  const { fetchSourceByToken } = useContext(SourceContext)
+
+  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault()
+    setSubmitStatus('loading')
+    try {
+      await fetchSourceByToken(token)
+      setSubmitStatus('success')
+      onClose()
+    } catch (error) {
+      setSubmitStatus('error')
+    }
+  }
+
+  return (
+    <Modal title='Connexion' onClose={onClose}>
+      <StyledWrapper onSubmit={handleSubmit}>
+        <p>Connectez-vous pour accéder à vos signalements.</p>
+        <label className='fr-label' htmlFor='nomVoie'>
+          Renseignez votre jeton d&apos;accès
+        </label>
+        <input
+          className='fr-input'
+          type='password'
+          name='token'
+          required
+          value={token}
+          onChange={(event) => setToken(event.target.value)}
+        />
+        {submitStatus === 'success' && (
+          <div className='fr-alert fr-alert--success'>
+            <p>Authentification réussie</p>
+          </div>
+        )}
+        {submitStatus === 'error' && (
+          <div className='fr-alert fr-alert--error'>
+            <p>Le jeton est incorrect</p>
+          </div>
+        )}
+        <div className='form-control'>
+          <button className='fr-btn fr-btn--secondary' onClick={onClose} type='button'>
+            Annuler
+          </button>
+          <button
+            className='fr-btn'
+            type='submit'
+            disabled={submitStatus === 'loading' || submitStatus === 'success'}
+          >
+            Se connecter
+          </button>
+        </div>
+      </StyledWrapper>
+    </Modal>
+  )
+}
diff --git a/src/composants/common/Header.tsx b/src/composants/common/Header.tsx
index 5b8a29a..68af5bf 100644
--- a/src/composants/common/Header.tsx
+++ b/src/composants/common/Header.tsx
@@ -1,7 +1,8 @@
-import React from 'react'
+import React, { useState } from 'react'
 import { Source } from '../../api/signalement'
 import useNavigateWithPreservedSearchParams from '../../hooks/useNavigateWithPreservedSearchParams'
 import styled from 'styled-components'
+import { AuthentificationModal } from '../authentification/AuthentificationModal'
 
 const StyledHeader = styled.header`
   .fr-header__navbar > .fr-btns-group {
@@ -27,75 +28,94 @@ interface HeaderProps {
 
 export function Header({ customSource, toggleShowInfo }: HeaderProps) {
   const { navigate } = useNavigateWithPreservedSearchParams()
+  const [showConnectionModal, setShowConnectionModal] = useState(false)
 
   return (
-    <StyledHeader role='banner' className='fr-header'>
-      <div className='fr-header__body'>
-        <div className='fr-container'>
-          <div className='fr-header__body-row'>
-            <div className='fr-header__brand fr-enlarge-link'>
-              <div className='fr-header__brand-top'>
-                <div className='fr-header__logo'>
-                  <p className='fr-logo' />
+    <>
+      <StyledHeader role='banner' className='fr-header'>
+        <div className='fr-header__body'>
+          <div className='fr-container'>
+            <div className='fr-header__body-row'>
+              <div className='fr-header__brand fr-enlarge-link'>
+                <div className='fr-header__brand-top'>
+                  <div className='fr-header__logo'>
+                    <p className='fr-logo' />
+                  </div>
+                  <div className='fr-header__navbar'>
+                    <ul className='fr-btns-group'>
+                      <li>
+                        {customSource ? (
+                          <button
+                            className='fr-btn fr-icon-account-circle-fill'
+                            onClick={() => navigate('/source')}
+                          >
+                            {customSource.nom}
+                          </button>
+                        ) : (
+                          <button
+                            className='fr-btn fr-icon-account-circle-line'
+                            onClick={() => setShowConnectionModal(true)}
+                          >
+                            Se connecter
+                          </button>
+                        )}
+                      </li>
+                      <li>
+                        <button
+                          title='À propos'
+                          className='fr-btn fr-icon-information-fill'
+                          onClick={toggleShowInfo}
+                        >
+                          À propos
+                        </button>
+                      </li>
+                    </ul>
+                  </div>
+                </div>
+                <div className='fr-header__service'>
+                  <a href='/' title='Accueil - Mes Signalements - DINUM)'>
+                    <p className='fr-header__service-title'>Mes Signalements</p>
+                  </a>
+                  <p className='fr-header__service-tagline'>
+                    Signaler un problème dans la Base Adresse Nationale
+                  </p>
                 </div>
-                <div className='fr-header__navbar'>
+              </div>
+              <div className='fr-header__tools'>
+                <div className='fr-header__tools-links'>
                   <ul className='fr-btns-group'>
-                    {customSource && (
-                      <li>
+                    <li>
+                      {customSource ? (
                         <button
-                          title={customSource.nom}
                           className='fr-btn fr-icon-account-circle-fill'
                           onClick={() => navigate('/source')}
                         >
                           {customSource.nom}
                         </button>
-                      </li>
-                    )}
+                      ) : (
+                        <button
+                          className='fr-btn fr-icon-account-circle-line'
+                          onClick={() => setShowConnectionModal(true)}
+                        >
+                          Se connecter
+                        </button>
+                      )}
+                    </li>
                     <li>
-                      <button
-                        title='À propos'
-                        className='fr-btn fr-icon-information-fill'
-                        onClick={toggleShowInfo}
-                      >
+                      <button className='fr-btn fr-icon-information-fill' onClick={toggleShowInfo}>
                         À propos
                       </button>
                     </li>
                   </ul>
                 </div>
               </div>
-              <div className='fr-header__service'>
-                <a href='/' title='Accueil - Mes Signalements - DINUM)'>
-                  <p className='fr-header__service-title'>Mes Signalements</p>
-                </a>
-                <p className='fr-header__service-tagline'>
-                  Signaler un problème dans la Base Adresse Nationale
-                </p>
-              </div>
-            </div>
-            <div className='fr-header__tools'>
-              <div className='fr-header__tools-links'>
-                <ul className='fr-btns-group'>
-                  {customSource && (
-                    <li>
-                      <button
-                        className='fr-btn fr-icon-account-circle-fill'
-                        onClick={() => navigate('/source')}
-                      >
-                        {customSource.nom}
-                      </button>
-                    </li>
-                  )}
-                  <li>
-                    <button className='fr-btn fr-icon-information-fill' onClick={toggleShowInfo}>
-                      À propos
-                    </button>
-                  </li>
-                </ul>
-              </div>
             </div>
           </div>
         </div>
-      </div>
-    </StyledHeader>
+      </StyledHeader>
+      {showConnectionModal && (
+        <AuthentificationModal onClose={() => setShowConnectionModal(false)} />
+      )}
+    </>
   )
 }
diff --git a/src/composants/map/SignalementMap.tsx b/src/composants/map/SignalementMap.tsx
index 0babed0..60cc0ae 100644
--- a/src/composants/map/SignalementMap.tsx
+++ b/src/composants/map/SignalementMap.tsx
@@ -4,6 +4,7 @@ import { Position, Signalement } from '../../api/signalement'
 import { cadastreLayers, parcelleHoveredLayer } from '../../config/map/layers'
 import { positionTypeOptions } from '../../utils/signalement.utils'
 import { Marker } from './Marker'
+import { ChangesRequested } from '../../types/signalement.types'
 
 interface SignalementMapProps {
   signalement: Signalement
@@ -20,7 +21,7 @@ function SignalementMap({
 }: SignalementMapProps) {
   const map = useMap()
   const [hoveredParcelle, setHoveredParcelle] = useState<null | string>(null)
-  const { positions, parcelles } = signalement.changesRequested
+  const { positions, parcelles } = signalement.changesRequested as ChangesRequested
 
   const cadastreFiltre = useMemo(
     () =>
@@ -121,7 +122,7 @@ function SignalementMap({
   )
 
   const signalementLabel = useMemo(() => {
-    const { numero, suffixe, nomVoie } = signalement.changesRequested
+    const { numero, suffixe, nomVoie } = signalement.changesRequested as ChangesRequested
 
     return [numero, suffixe, nomVoie].reduce((acc, cur) => {
       return cur ? `${acc} ${cur}` : acc
diff --git a/src/composants/signalement/RecapModal.tsx b/src/composants/signalement/RecapModal.tsx
index 38f0417..f9a12b6 100644
--- a/src/composants/signalement/RecapModal.tsx
+++ b/src/composants/signalement/RecapModal.tsx
@@ -1,6 +1,5 @@
-import React, { useState } from 'react'
+import React, { useContext, useState } from 'react'
 import HCaptcha from '@hcaptcha/react-hcaptcha'
-import { useSearchParams } from 'react-router-dom'
 import { StyledForm } from './signalement.styles'
 
 import {
@@ -8,10 +7,13 @@ import {
   Position,
   Signalement,
   SignalementsService,
+  Source,
 } from '../../api/signalement'
 import Modal from '../common/Modal'
 import { getPositionTypeLabel } from '../../utils/signalement.utils'
 import { getAdresseLabel } from '../../utils/adresse.utils'
+import { ChangesRequested } from '../../types/signalement.types'
+import SourceContext from '../../contexts/source.context'
 
 interface SignalementRecapModalProps {
   signalement: Signalement
@@ -29,14 +31,13 @@ export default function SignalementRecapModal({
   onSubmit,
 }: SignalementRecapModalProps) {
   const [submitStatus, setSubmitStatus] = useState<string | null>(null)
-  const [searchParams] = useSearchParams()
+  const { source } = useContext(SourceContext)
 
   const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault()
     setSubmitStatus('loading')
     try {
-      const sourceId =
-        searchParams.get('sourceId') || process.env.REACT_APP_API_SIGNALEMENT_SOURCE_ID
+      const sourceId = source?.id || process.env.REACT_APP_API_SIGNALEMENT_SOURCE_ID
       await SignalementsService.createSignalement(signalement as CreateSignalementDTO, sourceId)
       setSubmitStatus('success')
       setTimeout(() => {
@@ -48,7 +49,8 @@ export default function SignalementRecapModal({
     }
   }
 
-  const { numero, suffixe, nomVoie, positions, parcelles, nom } = signalement.changesRequested
+  const { numero, suffixe, nomVoie, positions, parcelles, nom } =
+    signalement.changesRequested as ChangesRequested
 
   return (
     <Modal title='Votre demande de signalement' onClose={onClose}>
@@ -196,34 +198,36 @@ export default function SignalementRecapModal({
             </div>
           </section>
         )}
-        <section>
-          <h4>Contact</h4>
-          <p>
-            Vous pouvez nous laisser votre adresse email si vous souhaitez être tenu informé du
-            traitement de votre signalement.
-          </p>
-          <div className='form-row'>
-            <div className='fr-input-group'>
-              <label className='fr-label' htmlFor='email'>
-                Email
-              </label>
-              <input
-                name='email'
-                className='fr-input'
-                type='email'
-                value={signalement.author?.email || ''}
-                onChange={(event) => onEditSignalement('author', 'email')(event.target.value)}
-              />
+        {source?.type !== Source.type.PRIVATE && (
+          <section>
+            <h4>Contact</h4>
+            <p>
+              Vous pouvez nous laisser votre adresse email si vous souhaitez être tenu informé du
+              traitement de votre signalement.
+            </p>
+            <div className='form-row'>
+              <div className='fr-input-group'>
+                <label className='fr-label' htmlFor='email'>
+                  Email
+                </label>
+                <input
+                  name='email'
+                  className='fr-input'
+                  type='email'
+                  value={signalement.author?.email || ''}
+                  onChange={(event) => onEditSignalement('author', 'email')(event.target.value)}
+                />
+              </div>
             </div>
-          </div>
 
-          <div className='captcha-wrapper'>
-            <HCaptcha
-              sitekey={process.env.REACT_APP_HCAPTCHA_SITE_KEY || ''}
-              onVerify={(token) => onEditSignalement('author', 'captchaToken')(token)}
-            />
-          </div>
-        </section>
+            <div className='captcha-wrapper'>
+              <HCaptcha
+                sitekey={process.env.REACT_APP_HCAPTCHA_SITE_KEY || ''}
+                onVerify={(token) => onEditSignalement('author', 'captchaToken')(token)}
+              />
+            </div>
+          </section>
+        )}
 
         {submitStatus === 'success' && (
           <div className='fr-alert fr-alert--success'>
diff --git a/src/composants/signalement/SignalementForm.tsx b/src/composants/signalement/SignalementForm.tsx
index bf3247c..fb20859 100644
--- a/src/composants/signalement/SignalementForm.tsx
+++ b/src/composants/signalement/SignalementForm.tsx
@@ -6,6 +6,7 @@ import SignalementNumeroDeleteForm from './signalement-numero/SignalementNumeroD
 import { Signalement } from '../../api/signalement'
 import { BANPlateformeResultTypeEnum } from '../../api/ban-plateforme/types'
 import { MapRef } from 'react-map-gl/maplibre'
+import SignalementVoieForm from './signalement-voie/SignalementVoieForm'
 
 interface SignalementFormProps {
   signalement: Signalement
@@ -36,8 +37,7 @@ export default function SignalementForm({
   return (
     <>
       {signalement?.type === Signalement.type.LOCATION_TO_UPDATE &&
-        (address.type === BANPlateformeResultTypeEnum.VOIE ||
-          address.type === BANPlateformeResultTypeEnum.LIEU_DIT) && (
+        address.type === BANPlateformeResultTypeEnum.LIEU_DIT && (
           <SignalementToponymeForm
             onClose={onClose}
             onSubmit={handleSubmit}
@@ -47,6 +47,17 @@ export default function SignalementForm({
           />
         )}
 
+      {signalement?.type === Signalement.type.LOCATION_TO_UPDATE &&
+        address.type === BANPlateformeResultTypeEnum.VOIE && (
+          <SignalementVoieForm
+            onClose={onClose}
+            onSubmit={handleSubmit}
+            onEditSignalement={onEditSignalement}
+            signalement={signalement}
+            address={address}
+          />
+        )}
+
       {signalement?.type === Signalement.type.LOCATION_TO_CREATE &&
         address.type === BANPlateformeResultTypeEnum.VOIE && (
           <SignalementNumeroForm
@@ -83,6 +94,7 @@ export default function SignalementForm({
           onEditSignalement={onEditSignalement}
         />
       )}
+
       {showRecapModal && (
         <RecapModal
           onSubmit={onClose}
diff --git a/src/composants/signalement/signalement-numero/SignalementNumeroForm.tsx b/src/composants/signalement/signalement-numero/SignalementNumeroForm.tsx
index 8d5001b..cd73967 100644
--- a/src/composants/signalement/signalement-numero/SignalementNumeroForm.tsx
+++ b/src/composants/signalement/signalement-numero/SignalementNumeroForm.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react'
 import { StyledForm } from '../signalement.styles'
 import PositionInput from '../../common/PositionInput'
-import { Position, Signalement } from '../../../api/signalement'
+import { NumeroChangesRequestedDTO, Position, Signalement } from '../../../api/signalement'
 import { getInitialSignalement } from '../../../utils/signalement.utils'
 import { blurPosition } from '../../../utils/position.utils'
 import { getAdresseLabel } from '../../../utils/adresse.utils'
@@ -31,7 +31,7 @@ export default function SignalementNumeroForm({
 
   const isSubmitDisabled = useMemo(() => {
     const { changesRequested } = signalement
-    const isDisabled = changesRequested.positions?.length === 0
+    const isDisabled = (changesRequested as NumeroChangesRequestedDTO).positions?.length === 0
     if (isCreation) {
       return isDisabled
     }
@@ -43,7 +43,8 @@ export default function SignalementNumeroForm({
     )
   }, [address, signalement, isCreation])
 
-  const { numero, suffixe, nomVoie, positions, parcelles } = signalement.changesRequested
+  const { numero, suffixe, nomVoie, positions, parcelles, comment } =
+    signalement.changesRequested as NumeroChangesRequestedDTO
 
   return (
     <StyledForm onSubmit={onSubmit}>
@@ -71,7 +72,7 @@ export default function SignalementNumeroForm({
               min={1}
               max={9998}
               type='number'
-              value={numero as number}
+              value={numero || ''}
               onChange={(event) =>
                 onEditSignalement('changesRequested', 'numero')(event.target.value)
               }
@@ -168,6 +169,24 @@ export default function SignalementNumeroForm({
           </div>
         </div>
       </section>
+      <section>
+        <div className='form-row'>
+          <div className='fr-input-group'>
+            <label className='fr-label' htmlFor='comment'>
+              Autres informations
+            </label>
+            <textarea
+              className='fr-input'
+              name='comment'
+              value={comment as string}
+              onChange={(event) =>
+                onEditSignalement('changesRequested', 'comment')(event.target.value)
+              }
+              placeholder="Informations complémentaires sur le problème d'adressage (facultatif)"
+            />
+          </div>
+        </div>
+      </section>
       <div className='form-controls'>
         <button
           className='fr-btn'
diff --git a/src/composants/signalement/signalement-toponyme/SignalementToponymeForm.tsx b/src/composants/signalement/signalement-toponyme/SignalementToponymeForm.tsx
index 40ce097..9c3dfe9 100644
--- a/src/composants/signalement/signalement-toponyme/SignalementToponymeForm.tsx
+++ b/src/composants/signalement/signalement-toponyme/SignalementToponymeForm.tsx
@@ -1,5 +1,5 @@
 import { StyledForm } from '../signalement.styles'
-import { Signalement } from '../../../api/signalement'
+import { Signalement, ToponymeChangesRequestedDTO } from '../../../api/signalement'
 import { getInitialSignalement } from '../../../utils/signalement.utils'
 import React, { useMemo } from 'react'
 import { getAdresseLabel } from '../../../utils/adresse.utils'
@@ -26,7 +26,7 @@ export default function SignalementToponymeForm({
     )
   }, [address, signalement])
 
-  const { nom } = signalement.changesRequested
+  const { nom, comment } = signalement.changesRequested as ToponymeChangesRequestedDTO
 
   return (
     <StyledForm onSubmit={onSubmit}>
@@ -95,6 +95,24 @@ export default function SignalementToponymeForm({
           </Button>
         </div> */}
       </section>
+      <section>
+        <div className='form-row'>
+          <div className='fr-input-group'>
+            <label className='fr-label' htmlFor='comment'>
+              Autres informations
+            </label>
+            <textarea
+              className='fr-input'
+              name='comment'
+              value={comment as string}
+              onChange={(event) =>
+                onEditSignalement('changesRequested', 'comment')(event.target.value)
+              }
+              placeholder="Informations complémentaires sur le problème d'adressage (facultatif)"
+            />
+          </div>
+        </div>
+      </section>
       <div className='form-controls'>
         <button
           className='fr-btn'
diff --git a/src/composants/signalement/signalement-voie/SignalementVoieForm.tsx b/src/composants/signalement/signalement-voie/SignalementVoieForm.tsx
new file mode 100644
index 0000000..7338f1c
--- /dev/null
+++ b/src/composants/signalement/signalement-voie/SignalementVoieForm.tsx
@@ -0,0 +1,90 @@
+import { StyledForm } from '../signalement.styles'
+import { Signalement, VoieChangesRequestedDTO } from '../../../api/signalement'
+import { getInitialSignalement } from '../../../utils/signalement.utils'
+import React, { useMemo } from 'react'
+import { getAdresseLabel } from '../../../utils/adresse.utils'
+
+interface SignalementVoieFormProps {
+  signalement: Signalement
+  onEditSignalement: (property: string, key: string) => (event: string) => void
+  onClose: () => void
+  address: any
+  onSubmit: any
+}
+
+export default function SignalementVoieForm({
+  signalement,
+  onEditSignalement,
+  onClose,
+  address,
+  onSubmit,
+}: SignalementVoieFormProps) {
+  const isSubmitDisabled = useMemo(() => {
+    return (
+      JSON.stringify(getInitialSignalement(address, signalement.type)) ===
+      JSON.stringify(signalement)
+    )
+  }, [address, signalement])
+
+  const { nom, comment } = signalement.changesRequested as VoieChangesRequestedDTO
+
+  return (
+    <StyledForm onSubmit={onSubmit}>
+      <h4>Signalement d&apos;un problème d&apos;adressage</h4>
+      <section>
+        <h5>Lieu concernée</h5>
+        <div className='form-row'>{getAdresseLabel(address)}</div>
+        <div className='form-row'>{address.commune.nom}</div>
+      </section>
+      <section>
+        <h5>Modifications demandées</h5>
+        <div className='form-row'>
+          <div className='fr-input-group'>
+            <label className='fr-label' htmlFor='nom'>
+              Nom
+            </label>
+            <input
+              name='nom'
+              required
+              type='text'
+              className='fr-input'
+              value={nom as string}
+              onChange={(event) => onEditSignalement('changesRequested', 'nom')(event.target.value)}
+            />
+          </div>
+        </div>
+      </section>
+      <section>
+        <div className='form-row'>
+          <div className='fr-input-group'>
+            <label className='fr-label' htmlFor='comment'>
+              Autres informations
+            </label>
+            <textarea
+              className='fr-input'
+              name='comment'
+              value={comment as string}
+              onChange={(event) =>
+                onEditSignalement('changesRequested', 'comment')(event.target.value)
+              }
+              placeholder="Informations complémentaires sur le problème d'adressage (facultatif)"
+            />
+          </div>
+        </div>
+      </section>
+      <div className='form-controls'>
+        <button
+          className='fr-btn'
+          disabled={isSubmitDisabled}
+          style={{ color: 'white' }}
+          type='submit'
+        >
+          Envoyer le signalement
+        </button>
+        <button className='fr-btn' type='button' onClick={onClose}>
+          Annuler
+        </button>
+      </div>
+    </StyledForm>
+  )
+}
diff --git a/src/contexts/map.context.tsx b/src/contexts/map.context.tsx
index 9cb7fad..7b3048d 100644
--- a/src/contexts/map.context.tsx
+++ b/src/contexts/map.context.tsx
@@ -1,4 +1,4 @@
-import React, { createContext, useCallback, useEffect, useState } from 'react'
+import React, { createContext, useCallback, useEffect, useMemo, useState } from 'react'
 import { MapRef } from 'react-map-gl/maplibre'
 import { mapStyles } from '../config/map/styles'
 import { DEFAULT_COLOR_DARK } from '../config/map/layers'
@@ -46,13 +46,10 @@ export function MapContextProvider(props: { children: React.ReactNode }) {
     }
   }, [mapRef])
 
-  const value = {
-    mapRef,
-    mapRefCb,
-    mapChildren,
-    setMapChildren,
-    markerColor,
-  }
+  const value = useMemo(
+    () => ({ mapRef, mapRefCb, mapChildren, setMapChildren, markerColor }),
+    [mapRef, mapRefCb, mapChildren, setMapChildren, markerColor],
+  )
 
   return <MapContext.Provider value={value} {...props} />
 }
diff --git a/src/contexts/source.context.tsx b/src/contexts/source.context.tsx
new file mode 100644
index 0000000..8b10ef2
--- /dev/null
+++ b/src/contexts/source.context.tsx
@@ -0,0 +1,49 @@
+import React, { createContext, useCallback, useEffect, useMemo, useState } from 'react'
+import { useSearchParams } from 'react-router-dom'
+import { OpenAPI, Source, SourcesService } from '../api/signalement'
+
+interface SourceContextValue {
+  source?: Source
+  fetchSourceByToken: (sourceToken: string) => Promise<void>
+}
+
+export const SourceContext = createContext<SourceContextValue>({
+  fetchSourceByToken: async () => {},
+})
+
+export function SourceContextProvider(props: { children: React.ReactNode }) {
+  const [searchParams] = useSearchParams()
+  const [sourceId] = useState<string | null>(searchParams.get('sourceId'))
+  const [sourceToken] = useState<string | null>(localStorage.getItem('sourceToken'))
+  const [source, setSource] = useState<Source>()
+
+  const fetchSourceById = useCallback(async (sourceId: string) => {
+    const source = await SourcesService.getSourceById(sourceId)
+    setSource(source)
+  }, [])
+
+  const fetchSourceByToken = useCallback(async (sourceToken: string) => {
+    const source = await SourcesService.getSourceByToken(sourceToken)
+    setSource(source)
+    Object.assign(OpenAPI, { TOKEN: sourceToken })
+    localStorage.setItem('sourceToken', sourceToken)
+  }, [])
+
+  useEffect(() => {
+    try {
+      if (sourceId) {
+        fetchSourceById(sourceId)
+      } else if (sourceToken) {
+        fetchSourceByToken(sourceToken)
+      }
+    } catch (e) {
+      console.error(e)
+    }
+  }, [sourceId, fetchSourceById, fetchSourceByToken])
+
+  const value = useMemo(() => ({ source, fetchSourceByToken }), [source, fetchSourceByToken])
+
+  return <SourceContext.Provider value={value} {...props} />
+}
+
+export default SourceContext
diff --git a/src/hooks/useCustomSource.ts b/src/hooks/useCustomSource.ts
index 14c2d31..aeafa15 100644
--- a/src/hooks/useCustomSource.ts
+++ b/src/hooks/useCustomSource.ts
@@ -1,40 +1,26 @@
 import { useCallback, useEffect, useState } from 'react'
-import { Signalement, SignalementsService, Source, SourcesService } from '../api/signalement'
-import { useSearchParams } from 'react-router-dom'
+import { Signalement, SignalementsService, Source } from '../api/signalement'
 
-export function useCustomSource() {
-  const [searchParams] = useSearchParams()
-  const [sourceId] = useState<string | null>(searchParams.get('sourceId'))
-  const [source, setSource] = useState<Source>()
+export function useCustomSource(source?: Source) {
   const [signalements, setSignalements] = useState<Signalement[]>([])
 
-  const fetchSource = useCallback(async (sourceId: string) => {
-    try {
-      const source = await SourcesService.getSourceById(sourceId)
-      setSource(source)
-    } catch (e) {
-      console.error(e)
-    }
-  }, [])
-
   const fetchSignalements = useCallback(async (sourceId: string) => {
     try {
       const paginatedSignalements = await SignalementsService.getSignalements(
         undefined,
         sourceId as string,
       )
-      setSignalements(paginatedSignalements.data)
+      setSignalements(paginatedSignalements.data as any)
     } catch (e) {
       console.error(e)
     }
   }, [])
 
   useEffect(() => {
-    if (sourceId) {
-      fetchSource(sourceId)
-      fetchSignalements(sourceId)
+    if (source) {
+      fetchSignalements(source.id)
     }
-  }, [sourceId, fetchSource, fetchSignalements])
+  }, [source, fetchSignalements])
 
   return {
     source,
diff --git a/src/hooks/useSignalement.ts b/src/hooks/useSignalement.ts
index aa1c97d..ff5249c 100644
--- a/src/hooks/useSignalement.ts
+++ b/src/hooks/useSignalement.ts
@@ -1,7 +1,8 @@
 import { useCallback, useState } from 'react'
-import { ChangesRequested, Signalement } from '../api/signalement'
+import { Signalement } from '../api/signalement'
 import { getInitialSignalement } from '../utils/signalement.utils'
 import { IBANPlateformeResult } from '../api/ban-plateforme/types'
+import { ChangesRequested } from '../types/signalement.types'
 
 export interface useSignalementType {
   signalement: Signalement | null
diff --git a/src/index.tsx b/src/index.tsx
index 16ceddc..3d98149 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -14,6 +14,7 @@ import { SourcePage } from './pages/SourcePage'
 import { MapContextProvider } from './contexts/map.context'
 import { AdresseSearchPage } from './pages/AdresseSearchPage'
 import GlobalStyle from './globalStyles'
+import { SourceContextProvider } from './contexts/source.context'
 
 const API_SIGNALEMENT_URL = process.env.REACT_APP_API_SIGNALEMENT_URL
 
@@ -35,17 +36,21 @@ const router = createHashRouter([
   {
     path: '/',
     element: (
-      <MapLayout>
-        <AdresseSearchPage />
-      </MapLayout>
+      <SourceContextProvider>
+        <MapLayout>
+          <AdresseSearchPage />
+        </MapLayout>
+      </SourceContextProvider>
     ),
   },
   {
     path: '/:code',
     element: (
-      <MapLayout>
-        <SignalementPage />
-      </MapLayout>
+      <SourceContextProvider>
+        <MapLayout>
+          <SignalementPage />
+        </MapLayout>
+      </SourceContextProvider>
     ),
     loader: async ({ params }) => {
       if (!params.code) {
@@ -64,9 +69,11 @@ const router = createHashRouter([
   {
     path: '/source',
     element: (
-      <MapLayout>
-        <SourcePage />
-      </MapLayout>
+      <SourceContextProvider>
+        <MapLayout>
+          <SourcePage />
+        </MapLayout>
+      </SourceContextProvider>
     ),
   },
 ])
diff --git a/src/layouts/MapLayout.tsx b/src/layouts/MapLayout.tsx
index 7c137fe..21a87be 100644
--- a/src/layouts/MapLayout.tsx
+++ b/src/layouts/MapLayout.tsx
@@ -7,12 +7,12 @@ import { useLocation, useNavigation } from 'react-router-dom'
 import { AdresseSearch } from '../composants/adresse/AdresseSearch'
 import Loader from '../composants/common/Loader'
 import useNavigateWithPreservedSearchParams from '../hooks/useNavigateWithPreservedSearchParams'
-import { useCustomSource } from '../hooks/useCustomSource'
 import MapContext from '../contexts/map.context'
 import { interactiveLayers } from '../config/map/layers'
 import { mapStyles } from '../config/map/styles'
 import { StylesSwitch } from '../composants/map/StylesSwitch'
 import { AboutModal } from '../composants/about/AboutModal'
+import SourceContext from '../contexts/source.context'
 
 const Layout = styled.div`
   position: relative;
@@ -57,7 +57,7 @@ export function MapLayout({ children }: MapLayoutProps) {
   const onMouseLeave = useCallback(() => setCursor(null), [])
 
   const { mapRefCb, mapChildren } = useContext(MapContext)
-  const { source: customSource } = useCustomSource()
+  const { source } = useContext(SourceContext)
 
   const { navigate } = useNavigateWithPreservedSearchParams()
   const navigation = useNavigation()
@@ -87,7 +87,7 @@ export function MapLayout({ children }: MapLayoutProps) {
 
   return (
     <Layout>
-      <Header customSource={customSource} toggleShowInfo={() => setShowInfo((state) => !state)} />
+      <Header customSource={source} toggleShowInfo={() => setShowInfo((state) => !state)} />
       <div className='main-wrapper'>
         <Map
           ref={mapRefCb}
diff --git a/src/pages/SignalementPage.tsx b/src/pages/SignalementPage.tsx
index 946dc94..cd5463c 100644
--- a/src/pages/SignalementPage.tsx
+++ b/src/pages/SignalementPage.tsx
@@ -9,7 +9,7 @@ import {
 } from '../api/ban-plateforme/types'
 import { NumeroCard } from '../composants/adresse/NumeroCard'
 import SignalementForm from '../composants/signalement/SignalementForm'
-import { ChangesRequested, Signalement } from '../api/signalement'
+import { NumeroChangesRequestedDTO, Signalement } from '../api/signalement'
 import { VoieCard } from '../composants/adresse/VoieCard'
 import { LieuDitCard } from '../composants/adresse/LieuDitCard'
 import useWindowSize from '../hooks/useWindowSize'
@@ -19,6 +19,7 @@ import SignalementMap from '../composants/map/SignalementMap'
 import { Marker } from '../composants/map/Marker'
 import { getAdresseLabel } from '../utils/adresse.utils'
 import { useMapContent } from '../hooks/useMapContent'
+import { ChangesRequested } from '../types/signalement.types'
 
 export function SignalementPage() {
   const [searchParams, setSearchParams] = useSearchParams()
@@ -88,7 +89,7 @@ export function SignalementPage() {
   const mapContent = useMemo(
     () => (
       <>
-        {!signalement?.changesRequested?.positions &&
+        {!(signalement?.changesRequested as NumeroChangesRequestedDTO)?.positions &&
           Boolean((adresse as IBANPlateformeNumero)?.lat) &&
           Boolean((adresse as IBANPlateformeNumero)?.lon) && (
             <Marker
@@ -100,10 +101,10 @@ export function SignalementPage() {
               color={markerColor}
             />
           )}
-        {signalement?.changesRequested?.positions && (
+        {(signalement?.changesRequested as NumeroChangesRequestedDTO)?.positions && (
           <SignalementMap
             isEditParcellesMode={isEditParcellesMode}
-            signalement={signalement}
+            signalement={signalement as Signalement}
             onEditSignalement={onEditSignalement}
             markerColor={markerColor}
           />
diff --git a/src/pages/SourcePage.tsx b/src/pages/SourcePage.tsx
index b913b2d..78d9242 100644
--- a/src/pages/SourcePage.tsx
+++ b/src/pages/SourcePage.tsx
@@ -12,6 +12,7 @@ import { Signalement } from '../api/signalement'
 import styled from 'styled-components'
 import { useMapContent } from '../hooks/useMapContent'
 import MapContext from '../contexts/map.context'
+import SourceContext from '../contexts/source.context'
 
 const StyledWrapper = styled.div`
   position: relative;
@@ -63,10 +64,11 @@ const filterOptions = [
 
 export function SourcePage() {
   const { markerColor } = useContext(MapContext)
+  const { source } = useContext(SourceContext)
   const [currentFilter, setCurrentFilter] = useState<Signalement.status | null>(
     Signalement.status.PENDING,
   )
-  const { signalements: customSourceSignalements } = useCustomSource()
+  const { signalements: customSourceSignalements } = useCustomSource(source)
   const filteredSignalements = useMemo(
     () =>
       currentFilter
@@ -82,10 +84,10 @@ export function SourcePage() {
           {getSignalementTypeLabel(signalement.type)}
         </p>
         <p>{getSignalementLabel(signalement)}</p>
-        <p>Créé le {new Date(signalement._createdAt).toLocaleDateString()}</p>
+        <p>Créé le {new Date(signalement.createdAt).toLocaleDateString()}</p>
         {signalement.processedBy && (
           <p>
-            Traité le {new Date(signalement._updatedAt).toLocaleDateString()} par{' '}
+            Traité le {new Date(signalement.updatedAt).toLocaleDateString()} par{' '}
             {signalement.processedBy.nom}
           </p>
         )}
@@ -101,7 +103,7 @@ export function SourcePage() {
           const coordinates = getSignalementCoodinates(signalement)
           return coordinates ? (
             <Marker
-              key={signalement._id as string}
+              key={signalement.id as string}
               coordinates={coordinates}
               color={markerColor}
               popupContent={getSignalementCard(signalement)}
diff --git a/src/types/signalement.types.ts b/src/types/signalement.types.ts
new file mode 100644
index 0000000..407b801
--- /dev/null
+++ b/src/types/signalement.types.ts
@@ -0,0 +1,11 @@
+import {
+  DeleteNumeroChangesRequestedDTO,
+  NumeroChangesRequestedDTO,
+  ToponymeChangesRequestedDTO,
+  VoieChangesRequestedDTO,
+} from '../api/signalement'
+
+export type ChangesRequested = NumeroChangesRequestedDTO &
+  DeleteNumeroChangesRequestedDTO &
+  VoieChangesRequestedDTO &
+  ToponymeChangesRequestedDTO
diff --git a/src/utils/signalement.utils.ts b/src/utils/signalement.utils.ts
index cce3f2c..56d3a50 100644
--- a/src/utils/signalement.utils.ts
+++ b/src/utils/signalement.utils.ts
@@ -1,5 +1,4 @@
 import {
-  ChangesRequested,
   ExistingLocation,
   ExistingNumero,
   ExistingToponyme,
@@ -8,6 +7,7 @@ import {
   Signalement,
 } from '../api/signalement'
 import { BANPlateformeResultTypeEnum } from '../api/ban-plateforme/types'
+import { ChangesRequested } from '../types/signalement.types'
 
 export const positionTypeOptions = [
   {
@@ -55,15 +55,15 @@ export function getSignalementCoodinates(signalement: Signalement): [number, num
       (signalement.existingLocation as ExistingNumero).position.point.coordinates[0],
       (signalement.existingLocation as ExistingNumero).position.point.coordinates[1],
     ]
-  } else if (signalement.changesRequested.positions) {
+  } else if ((signalement.changesRequested as ChangesRequested).positions) {
     return [
-      signalement.changesRequested.positions[0].point.coordinates[0],
-      signalement.changesRequested.positions[0].point.coordinates[1],
+      (signalement.changesRequested as ChangesRequested).positions[0].point.coordinates[0],
+      (signalement.changesRequested as ChangesRequested).positions[0].point.coordinates[1],
     ]
   }
 }
 
-export const getRequestedLocationLabel = (changesRequested: ChangesRequested) => {
+export const getRequestedLocationLabel = (changesRequested: any) => {
   return `${changesRequested.numero} ${
     changesRequested.suffixe ? `${changesRequested.suffixe} ` : ''
   }${changesRequested.nomVoie}`
@@ -228,17 +228,17 @@ export const getInitialSignalement = (
     author: {
       email: '',
     },
-    changesRequested: {},
+    changesRequested: {} as ChangesRequested,
   }
 
   switch (signalementType) {
     case Signalement.type.LOCATION_TO_CREATE:
       initialSignalement.changesRequested = {
-        numero: null,
         suffixe: '',
         nomVoie: address.nomVoie,
         positions: [],
         parcelles: [],
+        comment: '',
       }
       initialSignalement.existingLocation = {
         type: ExistingLocation.type.VOIE,
@@ -249,10 +249,12 @@ export const getInitialSignalement = (
       if (address.type === BANPlateformeResultTypeEnum.VOIE) {
         initialSignalement.changesRequested = {
           nom: address.nomVoie,
+          comment: '',
         }
       } else if (address.type === BANPlateformeResultTypeEnum.LIEU_DIT) {
         initialSignalement.changesRequested = {
           nom: address.nomVoie,
+          comment: '',
           // For the moment we don't allow to change the position of a toponyme
           // positions: address.positions,
           // parcelles: address.parcelles
@@ -272,6 +274,7 @@ export const getInitialSignalement = (
             }),
           ),
           parcelles: address.parcelles,
+          comment: '',
         }
       }