diff --git a/website/nutriform/migrations/0011_auto_20191127_2335.py b/website/nutriform/migrations/0011_auto_20191127_2335.py
new file mode 100644
index 0000000000000000000000000000000000000000..476f50e4ae058f0416f9018503cb638f0fa004f6
--- /dev/null
+++ b/website/nutriform/migrations/0011_auto_20191127_2335.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.6 on 2019-11-27 23:35
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nutriform', '0010_auto_20191127_2310'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='questionquotid',
+            name='date',
+            field=models.DateField(default=django.utils.timezone.now),
+        ),
+    ]
diff --git a/website/nutriform/models.py b/website/nutriform/models.py
index 28b93ceecfed950e5b08cdcac3ef7fbcba3c5557..ed64b7b67a64604d5d6dbb9a8283087807132469 100644
--- a/website/nutriform/models.py
+++ b/website/nutriform/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
 from datetime import date
+from django.utils import timezone
 
 # Create your models here.
 User._meta.get_field('email')._unique = True
@@ -55,7 +56,7 @@ class QuestionQuotid(models.Model):
     volume_eau = models.PositiveIntegerField()
     maladies = models.CharField(max_length=3, choices=MALADIES_CHOICES, null=True, blank=True)
     poids = models.PositiveIntegerField(null=True)
-    date = models.DateField(default=date.today)
+    date = models.DateField(default=timezone.now)
 
     def __str__(self):
         return self.user.__str__() + " : " + self.date.__str__()
diff --git a/website/nutriform/templates/nutriform/questionnaire.html b/website/nutriform/templates/nutriform/questionnaire.html
index 98e2af8a3409c59dd34bf5186078e0df7d021292..246be5b52bca57f983de91797cd44123bc127a77 100644
--- a/website/nutriform/templates/nutriform/questionnaire.html
+++ b/website/nutriform/templates/nutriform/questionnaire.html
@@ -7,6 +7,7 @@
     <h3>Questionnaire quotidien</h3>
     <p>Ce questinonaire permet de vous proposer des services plus personnalisés et adaptés à vos besoins</p>
 
+    {% if not q %}
     <form action="" method="POST">
         {% csrf_token %}
 
@@ -14,5 +15,9 @@
 
         <input type="submit" value="Enregistrer">
     </form>
+    {% else %}
+    <p>Vous avez déjà rempli votre questionnaire pour aujourd'hui. Revenez demain !</p>
+    <a href="{% url 'compte' %}" class="button">Retour au compte</a>
+    {% endif %}
 </div class="container">
 {% endblock %}
\ No newline at end of file
diff --git a/website/nutriform/views.py b/website/nutriform/views.py
index 0eebb655fc70589b1491c0f4e77f47fd03289b2e..7576a73e308f0b817b0d66b59d9ee02060c173a5 100644
--- a/website/nutriform/views.py
+++ b/website/nutriform/views.py
@@ -5,6 +5,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.forms import UserChangeForm
 from django.contrib.auth.models import User
 from datetime import date
+from django.utils import timezone
 
 from .forms import UserForm, UserModifForm, QuestionQuotidForm, InfoUserForm
 from .models import Menu, QuestionQuotid, InfosUser
@@ -135,7 +136,11 @@ def modif_infos(request):
 
 @login_required
 def question_quotid(request):
-
+	
+	try :
+		q = QuestionQuotid.objects.get(user=request.user, date=timezone.now())
+	except :
+		q = None
 
 	if request.method == 'POST':
 		form = QuestionQuotidForm(request.POST)
@@ -150,6 +155,7 @@ def question_quotid(request):
 	
 	context = {
 		'form':form,
+		'q': q
 	}
 	return render(request, 'nutriform/questionnaire.html', context)
 
diff --git a/website/website/settings.py b/website/website/settings.py
index 89dc7cb5a8ea11c60650c5b7aff0f04e0c2a5b2f..831b34513e97a85adc6fedf5cbd459ee36f13b59 100644
--- a/website/website/settings.py
+++ b/website/website/settings.py
@@ -112,7 +112,7 @@ AUTH_PASSWORD_VALIDATORS = [
 
 LANGUAGE_CODE = 'fr-fr'
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Europe/Paris'
 
 USE_I18N = True