diff --git a/htroot/ConfigBasic.html b/htroot/ConfigBasic.html
index 62a4dfce0..145ef5502 100644
--- a/htroot/ConfigBasic.html
+++ b/htroot/ConfigBasic.html
@@ -32,9 +32,11 @@
         <li>
           <img src="/env/grafics/ok.png" height="16" width="16" alt="ok" />&nbsp;Select a language for the interface:<br />
           <fieldset>
-            <input type="radio" name="language" id="lang_de" value="de" onchange="this.form.submit()" #(langDeutsch)#::checked="checked"#(/langDeutsch)# /><label for="lang_de">Deutsch</label>&nbsp;
-            <input type="radio" name="language" id="lang_fr" value="fr" onchange="this.form.submit()" #(langFrancais)#::checked="checked"#(/langFrancais)# /><label for="lang_fr">Fran&ccedil;ais</label>&nbsp;
-            <input type="radio" name="language" value="default" id="lang_en" onchange="this.form.submit()" #(langEnglish)#::checked="checked"#(/langEnglish)# /><label for="lang_en">English</label>
+            <input type="radio" name="language" value="de" id="lang_de" onchange="this.form.submit()" #(lang_de)#::checked="checked"#(/lang_de)# /><label for="lang_de">Deutsch</label>&nbsp;
+            <input type="radio" name="language" value="fr" id="lang_fr" onchange="this.form.submit()" #(lang_fr)#::checked="checked"#(/lang_fr)# /><label for="lang_fr">Fran&ccedil;ais</label>&nbsp;
+            <input type="radio" name="language" value="cn" id="lang_cn" onchange="this.form.submit()" #(lang_cn)#::checked="checked"#(/lang_cn)# /><label for="lang_cn">&#27721;&#35821;/&#28450;&#35486</label>
+            <input type="radio" name="language" value="ru" id="lang_ru" onchange="this.form.submit()" #(lang_ru)#::checked="checked"#(/lang_ru)# /><label for="lang_ru">Russian</label>
+            <input type="radio" name="language" value="default" id="lang_en" onchange="this.form.submit()" #(lang_en)#::checked="checked"#(/lang_en)# /><label for="lang_en">English</label>
           </fieldset>
         </li>
         <!-- take care that no other items are changed, but also change the former if no js is enabled -->
diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.java
index e13636f8c..de9d9f92f 100644
--- a/htroot/ConfigBasic.java
+++ b/htroot/ConfigBasic.java
@@ -263,22 +263,15 @@ public class ConfigBasic {
         prop.putHTML("defaultName", sb.peers.mySeed().getName());
         prop.putHTML("defaultPort", env.getConfig("port", "8090"));
         lang = env.getConfig("locale.language", "default"); // re-assign lang, may have changed
+        prop.put("lang_de", "0");
+        prop.put("lang_fr", "0");
+        prop.put("lang_cn", "0");
+        prop.put("lang_ru", "0");
+        prop.put("lang_en", "0");
         if ("default".equals(lang)) {
-            prop.put("langDeutsch", "0");
-            prop.put("langFrancais", "0");
-            prop.put("langEnglish", "1");
-        } else if ("fr".equals(lang)) {
-            prop.put("langDeutsch", "0");
-            prop.put("langFrancais", "1");
-            prop.put("langEnglish", "0");
-        } else if ("de".equals(lang)) {
-            prop.put("langDeutsch", "1");
-            prop.put("langFrancais", "0");
-            prop.put("langEnglish", "0");
+            prop.put("lang_en", "1");
         } else {
-            prop.put("langDeutsch", "0");
-            prop.put("langFrancais", "0");
-            prop.put("langEnglish", "0");
+            prop.put("lang_" + lang, "1");
         }
         return prop;
     }