diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ba685a..447b03f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ Every user-facing change should have an entry in this changelog. Please respect
 
 ## Unreleased
 
+- [Bugfix] Fix smtp server port in `cms.yml` which was causing email sending failures in the Studio. (by @regisb)
 - [Improvement] Use `git am` instead of `cherry-pick` to simplify patching process.
 
 ## v14.0.1 (2022-06-13)
diff --git a/tutor/templates/apps/openedx/config/cms.env.yml b/tutor/templates/apps/openedx/config/cms.env.yml
index c647320..9aa9b15 100644
--- a/tutor/templates/apps/openedx/config/cms.env.yml
+++ b/tutor/templates/apps/openedx/config/cms.env.yml
@@ -31,7 +31,7 @@ COMPREHENSIVE_THEME_DIRS: ["/openedx/themes"]
 STATIC_ROOT_BASE: "/openedx/staticfiles"
 EMAIL_BACKEND: "django.core.mail.backends.smtp.EmailBackend"
 EMAIL_HOST: "{{ SMTP_HOST }}"
-EMAIL_PORT: {{ SMTP_PORT }},
+EMAIL_PORT: {{ SMTP_PORT }}
 EMAIL_USE_TLS: {{ "true" if SMTP_USE_TLS else "false" }}
 HTTPS: "{{ "on" if ENABLE_HTTPS else "off" }}"
 LANGUAGE_CODE: "{{ LANGUAGE_CODE }}"
@@ -49,7 +49,7 @@ CACHES:
     LOCATION: "redis://{% if REDIS_USERNAME and REDIS_PASSWORD %}{{ REDIS_USERNAME }}:{{ REDIS_PASSWORD }}{% endif %}@{{ REDIS_HOST }}:{{ REDIS_PORT }}/{{ OPENEDX_CACHE_REDIS_DB }}"
   mongo_metadata_inheritance:
     KEY_PREFIX: "mongo_metadata_inheritance"
-    TIMEOUT: 300,
+    TIMEOUT: 300
     BACKEND: "django_redis.cache.RedisCache"
     LOCATION: "redis://{% if REDIS_USERNAME and REDIS_PASSWORD %}{{ REDIS_USERNAME }}:{{ REDIS_PASSWORD }}{% endif %}@{{ REDIS_HOST }}:{{ REDIS_PORT }}/{{ OPENEDX_CACHE_REDIS_DB }}"
   staticfiles: