diff --git a/app/user/routes.py b/app/user/routes.py
index c607b7f7..917f84fe 100644
--- a/app/user/routes.py
+++ b/app/user/routes.py
@@ -223,6 +223,7 @@ def change_settings():
         ('en', _l('English')),
         ('fr', _l('French')),
         ('de', _l('German')),
+        ('ja', _l('Japanese')),
     ]
     if form.validate_on_submit():
         propagate_indexable = form.indexable.data != current_user.indexable
diff --git a/config.py b/config.py
index a8e03ab1..ad005b97 100644
--- a/config.py
+++ b/config.py
@@ -22,7 +22,7 @@ class Config(object):
     RECAPTCHA_PUBLIC_KEY = os.environ.get("RECAPTCHA_PUBLIC_KEY") or None
     RECAPTCHA_PRIVATE_KEY = os.environ.get("RECAPTCHA_PRIVATE_KEY") or None
     MODE = os.environ.get('MODE') or 'development'
-    LANGUAGES = ['de', 'en', 'fr']
+    LANGUAGES = ['de', 'en', 'fr', 'ja']
     FULL_AP_CONTEXT = bool(int(os.environ.get('FULL_AP_CONTEXT', 0)))
     CACHE_TYPE = os.environ.get('CACHE_TYPE') or 'FileSystemCache'
     CACHE_REDIS_URL = os.environ.get('CACHE_REDIS_URL') or 'redis://localhost:6379/1'