diff --git a/CHANGELOG.md b/CHANGELOG.md
index e919aa6..09ea840 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Latest
 
+- [Improvement] Add configurable SMTP authentication
 - [Improvement] Harmonize mysql username/password configuration parameters
 - [Feature] Configurable and pluggable data storage backends (#114)
 
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 1bb2c97..98587a7 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -98,6 +98,8 @@ SMTP
 
 - ``SMTP_HOST`` (default: ``"smtp"``)
 - ``SMTP_PORT`` (default: ``25``)
+- ``SMTP_USERNAME`` (default: ``""``)
+- ``SMTP_PASSWORD`` (default: ``""``)
 
 Optional features
 -----------------
diff --git a/tutor/templates/apps/openedx/config/cms.auth.json b/tutor/templates/apps/openedx/config/cms.auth.json
index 8a00845..b3f4daf 100644
--- a/tutor/templates/apps/openedx/config/cms.auth.json
+++ b/tutor/templates/apps/openedx/config/cms.auth.json
@@ -30,5 +30,7 @@
       "PASSWORD": "{{ OPENEDX_MYSQL_PASSWORD }}",
       "ATOMIC_REQUESTS": true
     }
-  }
+  },
+  "EMAIL_HOST_USER": "{{ SMTP_USERNAME }}",
+  "EMAIL_HOST_PASSWORD": "{{ SMTP_PASSWORD }}"
 }
diff --git a/tutor/templates/apps/openedx/config/lms.auth.json b/tutor/templates/apps/openedx/config/lms.auth.json
index 8a00845..b3f4daf 100644
--- a/tutor/templates/apps/openedx/config/lms.auth.json
+++ b/tutor/templates/apps/openedx/config/lms.auth.json
@@ -30,5 +30,7 @@
       "PASSWORD": "{{ OPENEDX_MYSQL_PASSWORD }}",
       "ATOMIC_REQUESTS": true
     }
-  }
+  },
+  "EMAIL_HOST_USER": "{{ SMTP_USERNAME }}",
+  "EMAIL_HOST_PASSWORD": "{{ SMTP_PASSWORD }}"
 }
diff --git a/tutor/templates/config-defaults.yml b/tutor/templates/config-defaults.yml
index f18793c..647d401 100644
--- a/tutor/templates/config-defaults.yml
+++ b/tutor/templates/config-defaults.yml
@@ -38,6 +38,8 @@ NOTES_MYSQL_USERNAME: "notes"
 RABBITMQ_HOST: "rabbitmq"
 SMTP_HOST: "smtp"
 SMTP_PORT: 25
+SMTP_USERNAME: ""
+SMTP_PASSWORD: ""
 XQUEUE_AUTH_USERNAME: "lms"
 XQUEUE_MYSQL_DATABASE: "xqueue"
 XQUEUE_MYSQL_USERNAME: "xqueue"