diff --git a/.envs/.local/.django b/.envs/.local/.django
index e5628db0..598b66ad 100755
--- a/.envs/.local/.django
+++ b/.envs/.local/.django
@@ -14,6 +14,8 @@ EMAIL_PORT=1025
 EMAIL_USE_TLS=False
 EMAIL_HOST_USER=
 EMAIL_HOST_PASSWORD=
+DEFAULT_FROM_EMAIL=
+EMAIL_TIMEOUT=30
 
 # Redis
 # ------------------------------------------------------------------------------
diff --git a/config/settings/local.py b/config/settings/local.py
index 0d42f78e..11475010 100644
--- a/config/settings/local.py
+++ b/config/settings/local.py
@@ -28,7 +28,7 @@
 # EMAIL
 # ------------------------------------------------------------------------------
 EMAIL_HOST = env("EMAIL_HOST", default="mailpit")
-EMAIL_PORT = 1025
+EMAIL_PORT = env.int("EMAIL_PORT", default=25)
 EMAIL_TIMEOUT = env.int("EMAIL_TIMEOUT", default=30)
 EMAIL_USE_TLS = env("EMAIL_USE_TLS", default=True)
 EMAIL_HOST_USER = env("EMAIL_HOST_USER", default=None)