diff --git a/CHANGELOG.md b/CHANGELOG.md
index 185720d..f48f232 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.3.3 (2019-03-27)
+
+- [Bugfix] Fix login from localhost
+
 ## v3.3.2 (2019-03-27)
 
 - [Bugfix] Fix Android app image build
diff --git a/tutor/templates/apps/openedx/config/cms.env.json b/tutor/templates/apps/openedx/config/cms.env.json
index 783f30b..50e108e 100644
--- a/tutor/templates/apps/openedx/config/cms.env.json
+++ b/tutor/templates/apps/openedx/config/cms.env.json
@@ -33,7 +33,7 @@
   "EMAIL_PORT": {{ SMTP_PORT }},
   "HTTPS": "{{ "on" if ACTIVATE_HTTPS else "off" }}",
   "LANGUAGE_CODE": "{{ LANGUAGE_CODE }}",
-  "SESSION_COOKIE_DOMAIN": ".{{ lms_cms_common_domain }}",
+  {% if ACTIVATE_HTTPS %}"SESSION_COOKIE_DOMAIN": ".{{ lms_cms_common_domain }}",{% endif %}
   "CACHES": {
     "default": {
       "KEY_PREFIX": "default",
diff --git a/tutor/templates/apps/openedx/config/lms.env.json b/tutor/templates/apps/openedx/config/lms.env.json
index ae99c0c..e4b25a9 100644
--- a/tutor/templates/apps/openedx/config/lms.env.json
+++ b/tutor/templates/apps/openedx/config/lms.env.json
@@ -44,7 +44,6 @@
   {% endif %}
   "LANGUAGE_CODE": "{{ LANGUAGE_CODE }}",
   "LOGIN_REDIRECT_WHITELIST": ["{{ CMS_HOST }}", "studio.localhost"],
-  "SESSION_COOKIE_DOMAIN": ".{{ lms_cms_common_domain }}",
   "CACHES": {
     "default": {
       "KEY_PREFIX": "default",