diff --git a/.gitignore b/.gitignore
index 8065c03..29e6f53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ node_modules
 /static/*
 /media/*
 local_settings.py
-.venv
\ No newline at end of file
+.venv
+mails.sqlite
diff --git a/la_chariotte/settings.py b/la_chariotte/settings.py
index 3e66a52..f9595d3 100644
--- a/la_chariotte/settings.py
+++ b/la_chariotte/settings.py
@@ -174,10 +174,19 @@ if SENTRY_DSN:
 
 # Email settings
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
-EMAIL_HOST = os.getenv("EMAIL_HOST", "smtp.sendgrid.net")
+EMAIL_HOST = os.getenv("EMAIL_HOST")
 EMAIL_PORT = int(os.getenv("EMAIL_PORT", "587"))
-DEFAULT_FROM_EMAIL = os.getenv("DJANGO_DEFAULT_FROM_EMAIL", "laetitia@chariotte.fr")
+DEFAULT_FROM_EMAIL = os.getenv(
+    "DJANGO_DEFAULT_FROM_EMAIL", "La Chariotte <notification@chariotte.fr>"
+)
 DEFAULT_FROM_EMAIL_NAME = os.getenv("DJANGO_DEFAULT_FROM_EMAIL_NAME", "La Chariotte")
-EMAIL_HOST_USER = os.getenv("EMAIL_HOST_USER", "apikey")
+EMAIL_HOST_USER = os.getenv("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD")
 EMAIL_USE_TLS = os.getenv("EMAIL_USE_TLS", "True") == "True"
+
+if DEBUG:
+    EMAIL_HOST = "127.0.0.1"
+    EMAIL_HOST_USER = ""
+    EMAIL_HOST_PASSWORD = ""
+    EMAIL_PORT = 1025
+    EMAIL_USE_TLS = False
diff --git a/la_chariotte/urls.py b/la_chariotte/urls.py
index 4ab75c7..48142b9 100644
--- a/la_chariotte/urls.py
+++ b/la_chariotte/urls.py
@@ -17,7 +17,8 @@ Including another URLconf
 from django.contrib import admin
 from django.contrib.auth.views import (PasswordResetCompleteView,
                                        PasswordResetConfirmView,
-                                       PasswordResetDoneView)
+                                       PasswordResetDoneView,
+                                       PasswordResetView)
 from django.urls import include, path
 from django.views.generic.base import TemplateView
 
@@ -27,7 +28,12 @@ urlpatterns = [
     path("admin/", admin.site.urls),
     path("commande/", include("la_chariotte.order.urls")),
     path("comptes/", include("la_chariotte.accounts.urls")),
-    # paths for accounts that are easier to leave here
+    # Some paths for accounts are easier to leave here
+    # - PasswordResetView sends the mail
+    # - PasswordResetDoneView shows a success message for the above
+    # - PasswordResetConfirmView checks the link the user clicked and
+    #   prompts for a new password
+    # - PasswordResetCompleteView shows a success message for the above
     path(
         "comptes/reset/<uidb64>/<token>/",
         PasswordResetConfirmView.as_view(),