diff --git a/html/languages/translations/bg.po b/html/languages/translations/bg.po
index 6492069af8a5343b647f42328877c83c9ced2371..95ef70c3823939d5dd1cd0dc5c841e9211a617b2 100644
--- a/html/languages/translations/bg.po
+++ b/html/languages/translations/bg.po
@@ -9,6 +9,13 @@
 ##########################################
 msgid "CHARSET"
 msgstr "windows-1251"
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "Bulgarian"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "Bulgarian"
+
 
 #########################################
 # Apps page (apps.php)
diff --git a/html/languages/translations/cs.po b/html/languages/translations/cs.po
index f900a637dc3f239a2a7d9a1b245b02757f0704f3..28418ae7cee67f09cba9f45257c713f12c36d8f7 100644
--- a/html/languages/translations/cs.po
+++ b/html/languages/translations/cs.po
@@ -23,6 +23,13 @@ msgstr ""
 ##########################################
 msgid "CHARSET"
 msgstr "UTF-8"
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "Czech"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "Czech"
+
 
 #########################################
 # Apps page (apps.php)
diff --git a/html/languages/translations/da.po b/html/languages/translations/da.po
index 3df6d807a862eb374dd6a06bd41b8bb4df80604c..a06f4d1e9bb2855e26538c1f4a75d62178bdd72b 100644
--- a/html/languages/translations/da.po
+++ b/html/languages/translations/da.po
@@ -8,6 +8,13 @@
 # http://boinc.berkeley.edu/translate.html
 ##########################################
 
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "Danish"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "Danish"
+
 msgid "APPS_TITLE"
 msgstr "Applikationer"
 
diff --git a/html/languages/translations/de.po b/html/languages/translations/de.po
index 5a6df108dc6adb5c728a5f74156eaf754a50af33..e4f8442a11aeac95484b4e1b99270ff0a03757a7 100644
--- a/html/languages/translations/de.po
+++ b/html/languages/translations/de.po
@@ -9,6 +9,13 @@
 ##########################################
 msgid "CHARSET"
 msgstr "iso-8859-1"
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "German"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "German"
+
 
 #########################################
 # Apps page (apps.php)
@@ -310,4 +317,4 @@ msgstr "Konto-Konfigurierung"
 # General stuff (create_account_form.php and others)
 #########################################
 msgid "OPTIONAL"
-msgstr "Freiwillig"
\ No newline at end of file
+msgstr "Freiwillig"
diff --git a/html/languages/translations/es.po b/html/languages/translations/es.po
index 8ffb0505e675bfe7b2cf3f43cc8948802a50e4ef..02898f77678826de2d08b2df914874b72f2ed793 100644
--- a/html/languages/translations/es.po
+++ b/html/languages/translations/es.po
@@ -20,6 +20,13 @@ msgstr ""
 ##########################################
 msgid "CHARSET"
 msgstr "iso-8859-1"
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "Spanish"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "Spanish"
+
 
 #########################################
 # Apps page (apps.php)
diff --git a/html/languages/translations/fr.po b/html/languages/translations/fr.po
index 433d61d375b94a6fe6986d56babae2fd219f9685..99d4fe98023195827bf491affb911a3c9980c9fc 100644
--- a/html/languages/translations/fr.po
+++ b/html/languages/translations/fr.po
@@ -9,6 +9,13 @@
 ##########################################
 msgid "CHARSET"
 msgstr "iso-8859-1"
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "French"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "French"
+
 
 #########################################
 # Apps page (apps.php)
diff --git a/html/languages/translations/fr_CA.po b/html/languages/translations/fr_CA.po
index f24b71157dd31d9af279bec6e7a9cea2348a2e7f..fdcd8d6c2487f78760ff22730250eab0159d3980 100644
--- a/html/languages/translations/fr_CA.po
+++ b/html/languages/translations/fr_CA.po
@@ -10,6 +10,13 @@
 ##########################################
 msgid "CHARSET"
 msgstr "iso-8859-1" 
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "French/Canada"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "French/Canada"
+
 #########################################
 # Apps page (apps.php)
 #########################################
diff --git a/html/languages/translations/it.po b/html/languages/translations/it.po
index 38991184264bdbcd8c7f76eb535064110cad3346..18f0fd709a3fbea40d076fa5df1498182635ddc5 100644
--- a/html/languages/translations/it.po
+++ b/html/languages/translations/it.po
@@ -10,16 +10,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 ##########################################
-# Language: English (International)
+# Language: Italian
 # FileID  : $Id$
-# Author  : Janus Kristensen
-# Email   : jbk@visualgroup.dk
 ##########################################
 # For more information please see:
 # http://boinc.berkeley.edu/web_translation.php
 ##########################################
 msgid "CHARSET"
 msgstr "iso-8859-1"
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "Italian"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "Italian"
+
 
 #########################################
 # Apps page (apps.php)
diff --git a/html/languages/translations/ja.po b/html/languages/translations/ja.po
index 01b4d819311c71cfe36066bfed842bbea9343496..5f1923b3492e0f53009a75424dda02c5815be8f5 100644
--- a/html/languages/translations/ja.po
+++ b/html/languages/translations/ja.po
@@ -12,8 +12,6 @@ msgstr ""
 # ########################################
 # Language: Japanese
 # FileID  : $Id$
-# Author  : Janus Kristensen ( Translator: Komori Hitoshi, Reviewer: Takeda Nobuhiko )
-# Email   : jbk@visualgroup.dk( je2bwm at jarl.com )
 # ########################################
 # For more information please see:
 # http://boinc.berkeley.edu/web_translation.php
@@ -23,6 +21,13 @@ msgstr ""
 # msgstr "UTF-8"
 msgid "CHARSET"
 msgstr "UTF-8"
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "Japanese"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "Japanese"
+
 
 #########################################
 # Apps page (apps.php)
diff --git a/html/languages/translations/ru.po b/html/languages/translations/ru.po
index f8fa26b74fc76c6d5357deace2e5f27965b765b3..a67c21f3b6037096204f5e4bd1dc168dfffcec79 100644
--- a/html/languages/translations/ru.po
+++ b/html/languages/translations/ru.po
@@ -11,6 +11,13 @@
 
 msgid "CHARSET"
 msgstr "windows-1251"
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "Russian"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "Russian"
+
 
 #########################################
 # Apps page (apps.php)
diff --git a/html/languages/translations/tr.po b/html/languages/translations/tr.po
index fbe8f69a9a0e208bdfda45b843bea8b078bbd875..ef516f77093d86f9d37dd1bc00eabc1e21f269b0 100644
--- a/html/languages/translations/tr.po
+++ b/html/languages/translations/tr.po
@@ -10,16 +10,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 ##########################################
-# Language: English (International)
+# Language: Turkish
 # FileID  : $Id$
-# Author  : Janus Kristensen
-# Email   : jbk@visualgroup.dk
 ##########################################
 # For more information please see:
 # http://boinc.berkeley.edu/web_translation.php
 ##########################################
 msgid "CHARSET"
 msgstr "iso-8859-9"
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "Turkish"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "Turkish"
+
 
 #########################################
 # Apps page (apps.php)
diff --git a/html/languages/translations/zh_TW.po b/html/languages/translations/zh_TW.po
index c9be7f47573199fd0057c691098092c9d7ebd4af..1dcce5646127c66d718bf8557c4125b134b535ac 100644
--- a/html/languages/translations/zh_TW.po
+++ b/html/languages/translations/zh_TW.po
@@ -20,6 +20,13 @@ msgstr ""
 ##########################################
 msgid "CHARSET"
 msgstr "UTF-8"
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "Chinese/Taiwan"
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "Chinese/Taiwan"
+
 
 #########################################
 # Apps page (apps.php)
diff --git a/html/user/language_select.php b/html/user/language_select.php
index 1e7b7322fe556dac79aeeba0b34d0084c59832ed..30e3439a472e4198dc265bead38a2dd64b553043 100644
--- a/html/user/language_select.php
+++ b/html/user/language_select.php
@@ -12,7 +12,7 @@ if (get_str("set_lang")){
         exit;
     } else {
         setcookie('lang', get_str("set_lang"), time()+3600*24*365);
-        header("Location: language_select.php");
+        header("Location: index.php");
         flush();
         exit;
     }
@@ -37,6 +37,7 @@ echo "<p>The currently selected language is: <em>".tr(LANG_NAME_INTERNATIONAL)."
 
 
 start_table();
+row2("Language symbol", "Language name (click to select)");
 for ($i=0; $i<sizeof($languages);$i++){
     $lang_native[$i] = trSpecific(LANG_NAME_NATIVE,$languages[$i]);
     $lang_international[$i] = trSpecific(LANG_NAME_INTERNATIONAL, $languages[$i]);
@@ -45,12 +46,13 @@ for ($i=0; $i<sizeof($languages);$i++){
 array_multisort($lang_international, $languages, $lang_native);
 
 for ($i=0; $i<sizeof($languages);$i++){
-    if (file_exists($imgdir.$languages[$i].".png")){
-        $im = "<a href=\"language_select.php?set_lang=".$languages[$i]."\"><img height=\"12\" width=\"16\" src=\"".$imgdir.$languages[$i].".png\" border=0></a>";
-    } else {
-        $im="";
-    }
-    row3($im,
+//    if (file_exists($imgdir.$languages[$i].".png")){
+//        $im = "<a href=\"language_select.php?set_lang=".$languages[$i]."\"><img src=\"".$imgdir.$languages[$i].".png\" border=0></a>";
+//    } else {
+//        $im="";
+//    }
+//    row3($im,
+    row2(
         "<a href=\"language_select.php?set_lang=".$languages[$i]."\">".$languages[$i]."</a>",
         "<a href=\"language_select.php?set_lang=".$languages[$i]."\">".$lang_international[$i]." (".$lang_native[$i].")</a>"
     );