diff --git a/AUTHORS b/AUTHORS
index 2f4d7efead..42c8351bb9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -90,3 +90,4 @@ Nick Parlante <nick.parlante@cs.stanford.edu>
 Marko Seric <marko.seric@math.uzh.ch>
 Felipe Montoya <felipe.montoya@edunext.co>
 Julia Hansbrough <julia@edx.org>
+Nicolas Chevalier <nicolas.chevalier@epitech.eu>
\ No newline at end of file
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 7a32916c44..7fe8d8e10f 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -173,6 +173,11 @@ MKTG_URL_LINK_MAP.update(ENV_TOKENS.get('MKTG_URL_LINK_MAP', {}))
 # Timezone overrides
 TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE)
 
+# Translation overrides
+LANGUAGES = ENV_TOKENS.get('LANGUAGES', LANGUAGES)
+LANGUAGE_CODE = ENV_TOKENS.get('LANGUAGE_CODE', LANGUAGE_CODE)
+USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N)
+
 # Additional installed apps
 for app in ENV_TOKENS.get('ADDL_INSTALLED_APPS', []):
     INSTALLED_APPS += (app,)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index fe87c8900a..20e2f012b7 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -461,6 +461,7 @@ FAVICON_PATH = 'images/favicon.ico'
 # Locale/Internationalization
 TIME_ZONE = 'America/New_York'  # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 LANGUAGE_CODE = 'en'  # http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGES = ()
 
 # We want i18n to be turned off in production, at least until we have full localizations.
 # Thus we want the Django translation engine to be disabled. Otherwise even without