diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/mail/backends/smtp.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/django/core/mail/backends/smtp.py b/django/core/mail/backends/smtp.py index bb184ab312..3ee283b5f1 100644 --- a/django/core/mail/backends/smtp.py +++ b/django/core/mail/backends/smtp.py @@ -18,8 +18,14 @@ class EmailBackend(BaseEmailBackend): super(EmailBackend, self).__init__(fail_silently=fail_silently) self.host = host or settings.EMAIL_HOST self.port = port or settings.EMAIL_PORT - self.username = username or settings.EMAIL_HOST_USER - self.password = password or settings.EMAIL_HOST_PASSWORD + if username is None: + self.username = settings.EMAIL_HOST_USER + else: + self.username = username + if password is None: + self.password = settings.EMAIL_HOST_PASSWORD + else: + self.password = password if use_tls is None: self.use_tls = settings.EMAIL_USE_TLS else: |