diff --git a/client/src/routes/login.tsx b/client/src/routes/login.tsx
index 6b0a325..d7f2d20 100644
--- a/client/src/routes/login.tsx
+++ b/client/src/routes/login.tsx
@@ -11,14 +11,15 @@ const Login = () => {
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [cookies, setCookie] = useCookies(['token']);
+  const [keepMeLoggedIn, setKeepMeLoggedIn] = useState(false);
 
   const mutation = useMutation(login, {
     onSuccess: (data: Token) => {
-      setCookie('token', data.token, { path: '/', expires: new Date(data.expiresAt) });
+      setCookie('token', data.token, { path: '/', expires: keepMeLoggedIn ? new Date(data.expiresAt) : undefined });
     },
     onError: (error) => {
       toastError(error as string);
-    }
+    },
   });
 
   const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
@@ -68,6 +69,19 @@ const Login = () => {
                 />
               </div>
             </div>
+            <div className="flex items-center mb-2">
+                <input
+                  id="remember_me"
+                  name="remember_me"
+                  type="checkbox"
+                  className="h-4 w-4 text-red focus:ring-red border-gray-300 rounded"
+                  checked={keepMeLoggedIn}
+                  onChange={(e) => setKeepMeLoggedIn(e.target.checked)}
+                />
+                <label htmlFor="remember_me" className="ml-2 block text-sm text-white">
+                  Se souvenir de moi
+                </label>
+            </div>
             <div>
               <button
                 type="submit"
diff --git a/client/src/routes/signup.tsx b/client/src/routes/signup.tsx
index b89d7e7..e41136b 100644
--- a/client/src/routes/signup.tsx
+++ b/client/src/routes/signup.tsx
@@ -2,7 +2,7 @@ import { Token } from '@/types';
 import logo from '@assets/images/logo.svg';
 import { toastError, toastSuccess } from '@controllers/Toasts';
 import { signup } from '@controllers/UserController';
-import { useNavigate } from 'react-router-dom';
+import { Link, useNavigate } from 'react-router-dom';
 
 export default () => {
   const navigate = useNavigate();
@@ -23,8 +23,8 @@ export default () => {
         <div>
           <img className="mx-auto h-20 pb-2 w-auto" src={logo} alt="Groupomania" />
         </div>
-        <div className="w-full max-w-md space-y-8 bg-grey rounded-lg p-5">
-          <form className="m-6 " action="#" method="POST" onSubmit={(e) => onSubmit(e)}>
+        <div className="w-full max-w-md space-y-4 bg-grey rounded-lg p-5">
+          <form className="m-6 mb-0" action="#" method="POST" onSubmit={(e) => onSubmit(e)}>
             <div className="-space-y-px rounded-md shadow-sm">
               <div>
                 <label htmlFor="lastName" className="sr-only">
@@ -106,6 +106,11 @@ export default () => {
               </button>
             </div>
           </form>
+          <p className="text-center text-sm text-grey-dark">
+            <Link to="/login" className="font-medium text-red-light hover:text-red">
+              Retournez à la page de connexion
+            </Link>
+          </p>
         </div>
       </div>
     </>