diff --git a/src/Controller/ApprentiController.php b/src/Controller/ApprentiController.php
index 1591171..e8f2220 100644
--- a/src/Controller/ApprentiController.php
+++ b/src/Controller/ApprentiController.php
@@ -71,6 +71,16 @@ class ApprentiController extends AbstractController
             return $this->redirectToRoute('app_atelier_show', ["id" => $atelier->getId()], Response::HTTP_SEE_OTHER);
         }
 
+        $f = $formationUserRepository
+            ->findOneBy([
+                'atelier' => $atelier,
+                'eleve' => $this->getUser()
+            ]);
+
+        if ($f != null && !$form->isSubmitted()) {
+            $form->get('note')->setData($f->getNote());
+        }
+
         return $this->renderForm('atelier/noter.html.twig', [
             'atelier' => $atelier,
             'form' => $form,
diff --git a/src/Form/NoteType.php b/src/Form/NoteType.php
index 11840ce..bbc2f03 100644
--- a/src/Form/NoteType.php
+++ b/src/Form/NoteType.php
@@ -12,7 +12,6 @@ class NoteType extends AbstractType
     {
         $builder->add('note', IntegerType::class, [
             'attr' => array('min' => 0, 'max' => 5,),
-            'empty_data' => 0,
             'required' => false
         ]);
     }
diff --git a/templates/atelier/noter.html.twig b/templates/atelier/noter.html.twig
index 76f3552..c330149 100644
--- a/templates/atelier/noter.html.twig
+++ b/templates/atelier/noter.html.twig
@@ -1,9 +1,9 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}Modifier l'atelier{% endblock %}
+{% block title %}Noter l'atelier{% endblock %}
 
 {% block body %}
-    <h1>Modifier l'atelier</h1>
+    <h1>Noter l'atelier</h1>
 
     {{ form_start(form) }}
     {{ form_widget(form) }}