diff --git a/eshop_project/settings/base.py b/eshop_project/settings/base.py
index ba64516..5ab3900 100644
--- a/eshop_project/settings/base.py
+++ b/eshop_project/settings/base.py
@@ -156,8 +156,14 @@ AUTHENTICATION_BACKENDS = [
 LOGOUT_REDIRECT_URL = '/'
 LOGIN_REDIRECT_URL = reverse_lazy('index:index')
 
-# Email backend settings
+# Email settings
 EMAIL_BACKEND = 'djcelery_email.backends.CeleryEmailBackend'
+EMAIL_USE_TLS = env.bool('EMAIL_USE_TLS',True)
+EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", False)
+EMAIL_HOST = env.str('EMAIL_HOST')
+EMAIL_PORT = env.str('EMAIL_PORT')
+EMAIL_HOST_USER = env.str('EMAIL_HOST_USER')
+EMAIL_HOST_PASSWORD = env.str('EMAIL_HOST_PASSWORD')
 
 # Email fake validation settings
 DISPOSABLE_EMAIL_DOMAINS = os.path.join(TEMPLATE_DIR, 'emails/disposable_email_domains.txt')
@@ -184,15 +190,6 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-
-# Email config
-EMAIL_USE_TLS = EMAIL_CONFIG.get('EMAIL_USE_TLS',True)
-EMAIL_USE_SSL = EMAIL_CONFIG.get("EMAIL_USE_SSL", False)
-EMAIL_HOST = EMAIL_CONFIG.get('EMAIL_HOST')
-EMAIL_PORT = EMAIL_CONFIG.get('EMAIL_PORT')
-EMAIL_HOST_USER = EMAIL_CONFIG.get('EMAIL_HOST_USER')
-EMAIL_HOST_PASSWORD = EMAIL_CONFIG.get('EMAIL_HOST_PASSWORD')
-
 # Logging
 LOGGING = {
     'version': 1,