diff --git a/conf/locale/config.yaml b/conf/locale/config.yaml
index 298bc8082e..19ea9c77d2 100644
--- a/conf/locale/config.yaml
+++ b/conf/locale/config.yaml
@@ -22,7 +22,7 @@ locales:
     - es_419  # Spanish (Latin America)
 #    - es_AR  # Spanish (Argentina)
 #    - es_EC  # Spanish (Ecuador)
-#    - es_ES  # Spanish (Spain)
+    - es_ES  # Spanish (Spain)
 #    - es_MX  # Spanish (Mexico)
 #    - es_PE  # Spanish (Peru)
 #    - es_US  # Spanish (United States)
@@ -40,6 +40,7 @@ locales:
     - id  # Indonesian
     - it_IT  # Italian (Italy)
     - ja_JP  # Japanese (Japan)
+#    - kk_KZ  # Kazakh (Kazakhstan)
 #    - km_KH  # Khmer (Cambodia)
     - ko_KR  # Korean (Korea)
     - lt_LT  # Lithuanian (Lithuania)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index ebc339db14..f1c4233b43 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -547,7 +547,7 @@ LANGUAGES = (
     ('es-419', u'Español (Latinoamérica)'),  # Spanish (Latin America)
 #    ('es-ar', u'Español (Argentina)'),  # Spanish (Argentina)
 #    ('es-ec', u'Español (Ecuador)'),  # Spanish (Ecuador)
-#    ('es-es', u'Español (España)'),  # Spanish (Spain)
+    ('es-es', u'Español (España)'),  # Spanish (Spain)
 #    ('es-mx', u'Español (México)'),  # Spanish (Mexico)
 #    ('es-pe', u'Español (Perú)'),  # Spanish (Peru)
 #    ('es-us', u'Español (Estados Unidos)'),  # Spanish (United States)
@@ -565,6 +565,7 @@ LANGUAGES = (
     ('id', u'Bahasa Indonesia'),  # Indonesian
     ('it-it', u'Italiano (Italia)'),  # Italian (Italy)
     ('ja-jp', u'日本語(日本)'),  # Japanese (Japan)
+#    ('kk-kz', u'қазақ тілі (Қазақстан)'),  # Kazakh (Kazakhstan)
 #    ('km-kh', u'ភាសាខ្មែរ (កម្ពុជា)'),  # Khmer (Cambodia)
     ('ko-kr', u'한국어(대한민국)'),  # Korean (Korea)
     ('lt-lt', u'Lietuvių (Lietuva)'),  # Lithuanian (Lithuania)