diff --git a/docker-compose.yml b/docker-compose.yml
index 09ad2d4e6f95b1a2ecbd1e3e5f264cb1c7b4b4be..7e1d6b0b3213ae833d9062b578d49958a704230a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,6 +37,7 @@ services:
       - "80:8000"
     extra_hosts:
       walentygroupies.ipipan.waw.pl: 213.135.36.247
+      zimbra.ipipan.waw.pl: 213.135.36.155
 
   frontend:
     container_name: shellvalier-frontend
diff --git a/users/urls.py b/users/urls.py
index acc4488818c137240a98a5a6b67361b4a601feed..919311c50024f8dbf96582b2b6db28e747e03b02 100644
--- a/users/urls.py
+++ b/users/urls.py
@@ -2,6 +2,7 @@ from django.contrib.auth import views as auth_views
 from django.urls import include, path, re_path, reverse_lazy
 from django.views.generic import TemplateView
 
+from shellvalier.environment import get_environment
 from . import views
 from . import forms
 
@@ -34,6 +35,7 @@ urlpatterns = [
         'password-reset/',
         auth_views.PasswordResetView.as_view(
             template_name='password_reset.html',
+            from_email=get_environment('EMAIL_FROM', default=None),
             email_template_name='password_reset_email.html',
             success_url=reverse_lazy('users:password_reset_requested'),
             extra_context={'helper': forms.password_reset_form_helper},