diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 3b5b9bf28..78e0c49bd 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -329,9 +329,11 @@ class Reddit(Templated):
                                   css_class = "pref-lang")]
         else:
             lang = c.lang.split('-')[0] if c.lang else ''
-            buttons += [JsButton(g.lang_name.get(lang, lang),  
-                                  onclick = "return showlang();",
-                                  css_class = "pref-lang")]
+            lang_name = g.lang_name.get(lang) or [lang, '']
+            lang_name = "".join(lang_name)
+            buttons += [JsButton(lang_name,
+                                 onclick = "return showlang();",
+                                 css_class = "pref-lang")]
         return NavMenu(buttons, base_path = "/", type = "flatlist")
 
     def build_toolbars(self):
diff --git a/r2/r2/lib/translation.py b/r2/r2/lib/translation.py
index 6ccf728e1..ee1d817f7 100644
--- a/r2/r2/lib/translation.py
+++ b/r2/r2/lib/translation.py
@@ -595,20 +595,19 @@ def get_active_langs(path = _i18n_path, default_lang = 'en'):
     for lang in os.listdir(path):
         x = os.path.join(path, lang, 'LC_MESSAGES')
         if os.path.isdir(x):
-            name = Translator.get_name(lang)
-            trans_name[lang] = name
+            name = [Translator.get_name(lang), '']
             if Translator.is_enabled(lang) and Translator.in_use(lang):
                 if lang != default_lang:
                     trans.append(lang)
                     if Translator.get_complete_frac(lang) < .5:
-                        name += ' (*)'
+                        name[1] = ' (*)'
+            trans_name[lang] = name
     trans.sort()
     # insert the default language at the top of the list
     trans.insert(0, default_lang)
     if default_lang not in trans_name:
         trans_name[default_lang] = default_lang
     return trans, trans_name
-    
 
 
 class TranslatorTemplate(Translator):
@@ -621,7 +620,6 @@ class TranslatorTemplate(Translator):
     def to_file(*a, **kw):
         pass
 
-    
 
 class AutoTranslator(Translator):
     def __init__(self, **kw):
diff --git a/r2/r2/templates/utils.html b/r2/r2/templates/utils.html
index a831f3903..4979fb9a6 100644
--- a/r2/r2/templates/utils.html
+++ b/r2/r2/templates/utils.html
@@ -199,7 +199,7 @@ ${unsafe(txt)}
   %endif
   %for x in langs:
   <option ${x == default_lang  and "selected='selected'" or ""} value="${x}">
-    ${g.lang_name[x]} [${x}]
+    ${g.lang_name[x][0]} [${x}] ${g.lang_name[x][1]}
   </option>
   %endfor
 </select>
@@ -237,7 +237,7 @@ ${unsafe(txt)}
     %>
     <input type="checkbox" name="${idname}" id="${idname}"
            onclick="check_some_langs(this)" ${checked}/>
-    <label for="${idname}">${g.lang_name[lang]}</label>
+    <label for="${idname}">${g.lang_name[lang][0]}</label>
     </td>
   %endfor
   </tr>