diff --git a/webapp-next/components/landing/NavbarLanding.tsx b/webapp-next/components/landing/NavbarLanding.tsx
index 9569e51..1199e3d 100644
--- a/webapp-next/components/landing/NavbarLanding.tsx
+++ b/webapp-next/components/landing/NavbarLanding.tsx
@@ -4,25 +4,25 @@ import {
   Flex,
   Image,
   Box,
-  useBreakpointValue,
   Text,
   useDisclosure,
   Wrap,
   WrapItem,
   CloseButton,
-  Link,
 } from "@chakra-ui/react";
-
 import NextLink from "next/link";
 import { useRouter } from "next/router";
-import cookie from "js-cookie";
-import { ELASTIC_API_KEY_NAME } from "@/utils/tools";
+import useSWR from "swr";
 
 export default function NavbarLanding() {
   const { isOpen, onOpen, onClose } = useDisclosure();
+
   const router = useRouter();
 
-  const hasApiKey = !!cookie.get(ELASTIC_API_KEY_NAME);
+  const { data: user, isLoading: isLoadingUser } = useSWR(
+    "/api/auth/user",
+    (...args) => fetch(...args).then((res) => res.json())
+  );
 
   const links = [
     { label: "Accueil", path: "/" },
@@ -72,7 +72,7 @@ export default function NavbarLanding() {
           <HamburgerIcon onClick={onOpen} display={["inline", "none"]} />
         )}
       </Flex>
-      {hasApiKey ? (
+      {!isLoadingUser && !!user ? (
         <Flex as="nav" bg="white">
           <Button
             as={NextLink}
diff --git a/webapp-next/components/layouts/Menu.tsx b/webapp-next/components/layouts/Menu.tsx
index d77f523..70727fa 100644
--- a/webapp-next/components/layouts/Menu.tsx
+++ b/webapp-next/components/layouts/Menu.tsx
@@ -183,7 +183,6 @@ export function Menu() {
                 label: 'Déconnexion',
                 icon: '/icons/log-out.svg',
                 onClick: () => {
-                  cookie.remove(ELASTIC_API_KEY_NAME);
                   triggerInvalidateApiKey({
                     username: context.user.username as string
                   }).then(() => {
diff --git a/webapp-next/components/login/FormLogin.tsx b/webapp-next/components/login/FormLogin.tsx
index 6e582e4..b048b2a 100644
--- a/webapp-next/components/login/FormLogin.tsx
+++ b/webapp-next/components/login/FormLogin.tsx
@@ -104,14 +104,10 @@ export const FormLogin = () => {
   const handleModalTermsAccept = async () => {
     if (code) {
       await triggerCreateUser({ username, versionCGU: "1" });
-      const res = (await triggerVerify({
+      (await triggerVerify({
         username: username,
         code: code.toString(),
       })) as any;
-      const result = await res.json();
-      cookie.set(ELASTIC_API_KEY_NAME, result.apiKey.encoded, {
-        expires: 1,
-      });
       onCloseTerms();
       router.push("/bo");
     }
@@ -132,9 +128,6 @@ export const FormLogin = () => {
         if (result.firstLogin) {
           onOpenTerms();
         } else {
-          cookie.set(ELASTIC_API_KEY_NAME, result.apiKey.encoded, {
-            expires: 1,
-          });
           router.push("/bo");
         }
         setIsLoading(false);
@@ -157,13 +150,7 @@ export const FormLogin = () => {
       setIsLoading(true);
       const res = (await triggerLogin({ username, password })) as any;
       if (res.ok) {
-        const result = await res.json();
-        if (process.env.NODE_ENV === "development") {
-          cookie.set(ELASTIC_API_KEY_NAME, result.encoded, {
-            expires: 1,
-          });
-          router.push("/bo");
-        }
+        if (process.env.NODE_ENV === "development") router.push("/bo");
         startTimer();
         setShowCodeForm(true);
         setIsLoading(false);
diff --git a/webapp-next/next.config.js b/webapp-next/next.config.js
index bfecc51..0b86d3c 100644
--- a/webapp-next/next.config.js
+++ b/webapp-next/next.config.js
@@ -1,11 +1,37 @@
+const cspHeader = `
+    default-src 'self' sentry.numericite.eu;
+    script-src 'self' 'unsafe-eval' 'unsafe-inline';
+    style-src 'self' 'unsafe-inline';
+    img-src 'self' blob: data:;
+    font-src 'self';
+    object-src 'none';
+    base-uri 'self';
+    form-action 'self';
+    frame-ancestors 'none';
+    worker-src 'self' blob:;
+    upgrade-insecure-requests;
+`;
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
-  output: "standalone"
-}
-
-module.exports = nextConfig
+  output: "standalone",
+  async headers() {
+    return [
+      {
+        source: "/(.*)",
+        headers: [
+          {
+            key: "Content-Security-Policy",
+            value: cspHeader.replace(/\n/g, ""),
+          },
+        ],
+      },
+    ];
+  },
+};
 
+module.exports = nextConfig;
 
 // Injected content via Sentry wizard below
 
@@ -21,7 +47,10 @@ module.exports = withSentryConfig(
     silent: true,
     org: "numericite",
     project: "cm2d-nextjs",
-    url: "https://sentry.numericite.eu/"
+    url: "https://sentry.numericite.eu/",
+    errorHandler: (err, _, compilation) => {
+      compilation.warnings.push("Sentry CLI Plugin: " + err.message);
+    },
   },
   {
     // For all available options, see:
diff --git a/webapp-next/pages/api/auth/index.ts b/webapp-next/pages/api/auth/index.ts
index f6b23b5..a7ffe05 100644
--- a/webapp-next/pages/api/auth/index.ts
+++ b/webapp-next/pages/api/auth/index.ts
@@ -2,7 +2,8 @@ import { sendMail } from '@/utils/mailter';
 import {
   generateCode,
   getCodeEmailHtml,
-  ELASTIC_API_KEY_NAME
+  ELASTIC_API_KEY_NAME,
+  setCookieServerSide
 } from '@/utils/tools';
 import { Client } from '@elastic/elasticsearch';
 import fs from 'fs';
@@ -74,6 +75,7 @@ export default async function handler(
       });
 
       if (process.env.NODE_ENV === 'development') {
+        setCookieServerSide(res, securityToken.encoded);
         res.status(200).json(securityToken);
       } else {
         tmpCodes[username] = { code: generateCode(), apiKey: securityToken };
diff --git a/webapp-next/pages/api/auth/invalidate-api-key.ts b/webapp-next/pages/api/auth/invalidate-api-key.ts
index 7c31500..d504e32 100644
--- a/webapp-next/pages/api/auth/invalidate-api-key.ts
+++ b/webapp-next/pages/api/auth/invalidate-api-key.ts
@@ -1,3 +1,4 @@
+import { ELASTIC_API_KEY_NAME } from "@/utils/tools";
 import { Client } from "@elastic/elasticsearch";
 import fs from "fs";
 import type { NextApiRequest, NextApiResponse } from "next";
@@ -27,6 +28,12 @@ export default async function handler(
         username,
       });
 
+      res.setHeader("Set-Cookie", [
+        `${ELASTIC_API_KEY_NAME}=; Path=/; HttpOnly; Max-Age=-1; ${
+          process.env.NODE_ENV !== "development" ? "Secure" : ""
+        }`,
+      ]);
+
       res.status(200).json(invalidatedApiKey);
     } catch (error: any) {
       res.status(500).end();
diff --git a/webapp-next/pages/api/auth/verify-code.ts b/webapp-next/pages/api/auth/verify-code.ts
index 53efc1e..ffe8916 100644
--- a/webapp-next/pages/api/auth/verify-code.ts
+++ b/webapp-next/pages/api/auth/verify-code.ts
@@ -3,6 +3,7 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import fs from "fs";
 import path from "path";
 import rateLimit from "@/utils/rate-limit";
+import { setCookieServerSide } from "@/utils/tools";
 const tmpCodes = require("../../../utils/codes");
 
 const limiter = rateLimit({
@@ -54,6 +55,10 @@ export default async function handler(
         firstLogin = true;
       }
 
+      if (!firstLogin) {
+        setCookieServerSide(res, codeObj.apiKey.encoded)
+      }
+
       res.status(200).json({
         apiKey:
           firstLogin && process.env.NODE_ENV !== "development"
diff --git a/webapp-next/sentry.client.config.ts b/webapp-next/sentry.client.config.ts
index 21585ee..c75890b 100644
--- a/webapp-next/sentry.client.config.ts
+++ b/webapp-next/sentry.client.config.ts
@@ -4,27 +4,29 @@
 
 import * as Sentry from "@sentry/nextjs";
 
-Sentry.init({
-  dsn: "https://c334baad1c926c98296ad34785ece1af@sentry.numericite.eu/3",
+if (process.env.NODE_ENV !== "development") {
+  Sentry.init({
+    dsn: "https://c334baad1c926c98296ad34785ece1af@sentry.numericite.eu/3",
 
-  // Adjust this value in production, or use tracesSampler for greater control
-  tracesSampleRate: 1,
+    // Adjust this value in production, or use tracesSampler for greater control
+    tracesSampleRate: 1,
 
-  // Setting this option to true will print useful information to the console while you're setting up Sentry.
-  debug: false,
+    // Setting this option to true will print useful information to the console while you're setting up Sentry.
+    debug: false,
 
-  replaysOnErrorSampleRate: 1.0,
+    replaysOnErrorSampleRate: 1.0,
 
-  // This sets the sample rate to be 10%. You may want this to be 100% while
-  // in development and sample at a lower rate in production
-  replaysSessionSampleRate: 0.1,
+    // This sets the sample rate to be 10%. You may want this to be 100% while
+    // in development and sample at a lower rate in production
+    replaysSessionSampleRate: 0.1,
 
-  // You can remove this option if you're not planning to use the Sentry Session Replay feature:
-  integrations: [
-    new Sentry.Replay({
-      // Additional Replay configuration goes in here, for example:
-      maskAllText: true,
-      blockAllMedia: true,
-    }),
-  ],
-});
+    // You can remove this option if you're not planning to use the Sentry Session Replay feature:
+    integrations: [
+      new Sentry.Replay({
+        // Additional Replay configuration goes in here, for example:
+        maskAllText: true,
+        blockAllMedia: true,
+      }),
+    ],
+  });
+}
diff --git a/webapp-next/sentry.edge.config.ts b/webapp-next/sentry.edge.config.ts
index f4585ee..67266e4 100644
--- a/webapp-next/sentry.edge.config.ts
+++ b/webapp-next/sentry.edge.config.ts
@@ -5,12 +5,14 @@
 
 import * as Sentry from "@sentry/nextjs";
 
-Sentry.init({
-  dsn: "https://c334baad1c926c98296ad34785ece1af@sentry.numericite.eu/3",
+if (process.env.NODE_ENV !== "development") {
+  Sentry.init({
+    dsn: "https://c334baad1c926c98296ad34785ece1af@sentry.numericite.eu/3",
 
-  // Adjust this value in production, or use tracesSampler for greater control
-  tracesSampleRate: 1,
+    // Adjust this value in production, or use tracesSampler for greater control
+    tracesSampleRate: 1,
 
-  // Setting this option to true will print useful information to the console while you're setting up Sentry.
-  debug: false,
-});
+    // Setting this option to true will print useful information to the console while you're setting up Sentry.
+    debug: false,
+  });
+}
diff --git a/webapp-next/sentry.server.config.ts b/webapp-next/sentry.server.config.ts
index 015fb65..a40c868 100644
--- a/webapp-next/sentry.server.config.ts
+++ b/webapp-next/sentry.server.config.ts
@@ -4,12 +4,14 @@
 
 import * as Sentry from "@sentry/nextjs";
 
-Sentry.init({
-  dsn: "https://c334baad1c926c98296ad34785ece1af@sentry.numericite.eu/3",
+if (process.env.NODE_ENV !== "development") {
+  Sentry.init({
+    dsn: "https://c334baad1c926c98296ad34785ece1af@sentry.numericite.eu/3",
 
-  // Adjust this value in production, or use tracesSampler for greater control
-  tracesSampleRate: 1,
+    // Adjust this value in production, or use tracesSampler for greater control
+    tracesSampleRate: 1,
 
-  // Setting this option to true will print useful information to the console while you're setting up Sentry.
-  debug: false,
-});
+    // Setting this option to true will print useful information to the console while you're setting up Sentry.
+    debug: false,
+  });
+}
diff --git a/webapp-next/utils/tools.ts b/webapp-next/utils/tools.ts
index 9cae1ce..8fb5701 100644
--- a/webapp-next/utils/tools.ts
+++ b/webapp-next/utils/tools.ts
@@ -1,5 +1,7 @@
-import moment from "moment";
-import { Filters, SearchCategory, View } from "./cm2d-provider";
+import { format } from 'date-fns';
+import moment from 'moment';
+import { Filters, SearchCategory, View } from './cm2d-provider';
+import { NextApiResponse } from 'next';
 
 export const viewRefs: { label: string; value: View }[] = [
   { label: "Vue courbe", value: "line" },
@@ -794,7 +796,20 @@ export function removeAccents(str: string) {
 }
 
 export const ELASTIC_API_KEY_NAME =
-  (process.env.NEXT_PUBLIC_ELASTIC_API_KEY_NAME as string) || "cm2d_api_key";
+  (process.env.NEXT_PUBLIC_ELASTIC_API_KEY_NAME as string) || 'cm2d_api_key';
+
+
+export const setCookieServerSide = (
+  res: NextApiResponse,
+  securityTokenEncoded: string
+) => {
+  res.setHeader(
+    "Set-Cookie",
+    `${ELASTIC_API_KEY_NAME}=${securityTokenEncoded}; path=/; HttpOnly; ${
+      process.env.NODE_ENV !== "development" ? "Secure;" : ""
+    }`
+  );
+};
 
 export async function swrPOSTFetch<T>(url: string, { arg }: { arg: T }) {
   return fetch(url, {
@@ -802,4 +817,4 @@ export async function swrPOSTFetch<T>(url: string, { arg }: { arg: T }) {
     body: JSON.stringify(arg),
     headers: { "Content-Type": "application/json" },
   });
-}
\ No newline at end of file
+}