diff --git a/trunk/includes/js/LSdefault.js b/trunk/includes/js/LSdefault.js
index fc939975..8c206dd0 100644
--- a/trunk/includes/js/LSdefault.js
+++ b/trunk/includes/js/LSdefault.js
@@ -85,6 +85,9 @@ var LSdefault = new Class({
           this.LSlang_select.getElements('img').each(function(img) {
             img.addEvent('click',this.onSelectLSlangImgClick.bind(this,img));
           },this);
+          document.getElements('.LSlang_hidden').each(function(el) {
+            el.dispose();
+          },this);
         }
       }
     },
diff --git a/trunk/templates/default/login.tpl b/trunk/templates/default/login.tpl
index 4fc13ee0..3024a211 100644
--- a/trunk/templates/default/login.tpl
+++ b/trunk/templates/default/login.tpl
@@ -28,6 +28,14 @@
   <dd><input type='text' name='LSsession_user' /></dd>
   <dt>{$loginform_label_pwd}</dt>
   <dd><input type='password' name='LSsession_pwd' /></dd>
+  <dt class='LSlang_hidden'>{$lang_label}</dt>
+  <dd class='LSlang_hidden'>
+  <select name='lang'>
+  {foreach from=$LSlanguages item=lang}
+    <option value='{$lang}'>{$lang}</option>
+  {/foreach}
+  </select>
+  </dd>
   <dd><input type='submit' value='{$loginform_label_submit}' /></dd>
 </dl>
 </form>
diff --git a/trunk/templates/default/top.tpl b/trunk/templates/default/top.tpl
index 18651600..034134c5 100644
--- a/trunk/templates/default/top.tpl
+++ b/trunk/templates/default/top.tpl
@@ -38,6 +38,14 @@
     </td>
     <td id='status'>
     <span>{$lang_label} : <img id='LSlang' src='{$LS_IMAGES_DIR}/{$LSlang}.png' alt='{$LSlang}' title='{$LSlang}'/></span>
+    <form action='' methode='post' style='display: inline' class='LSlang_hidden'/>
+      <select name='lang'>
+      {foreach from=$LSlanguages item=lang}
+        <option value='{$lang}'>{$lang}</option>
+      {/foreach}
+      </select>
+      <input type='submit' value='->'/>
+    </form>
     {$connected_as} <span id='user_name'>{$LSsession_username}</span> <a href='index.php?LSsession_logout'><img src='{$LS_IMAGES_DIR}/logout.png' alt='Logout' title='Logout' /></a>
     </td>
   </tr>