diff --git a/r2/r2/controllers/validator/validator.py b/r2/r2/controllers/validator/validator.py
index 6df7263f8..afd98d755 100644
--- a/r2/r2/controllers/validator/validator.py
+++ b/r2/r2/controllers/validator/validator.py
@@ -223,11 +223,8 @@ class nop(Validator):
 
 class VLang(Validator):
     def run(self, lang):
-        if lang:
-            lang = str(lang.split('[')[1].strip(']'))
-            if lang in g.all_languages:
-                return lang
-        #else
+        if lang in g.all_languages:
+            return lang
         return g.lang
 
 class VRequired(Validator):
diff --git a/r2/r2/templates/utils.html b/r2/r2/templates/utils.html
index e1a096b25..484dead78 100644
--- a/r2/r2/templates/utils.html
+++ b/r2/r2/templates/utils.html
@@ -201,7 +201,7 @@ ${unsafe(txt)}
   </option>
   %endif
   %for x in langs:
-  <option ${x == default_lang  and "selected='selected'" or ""}>
+  <option ${x == default_lang  and "selected='selected'" or ""} value="${x}">
     ${g.lang_name[x]} [${x}]
   </option>
   %endfor