diff --git a/trunk/css/black/login.css b/trunk/css/black/login.css
index 2b171881..c7a56f60 100644
--- a/trunk/css/black/login.css
+++ b/trunk/css/black/login.css
@@ -58,7 +58,7 @@ dl.loginform {
   margin-left:            1em;
 }
 
-#LSsession_recoverPassword {
+a.LSsession_recoverPassword {
   float:                  right;
   font-size:              0.8em;
   text-decoration:        none;
diff --git a/trunk/css/default/login.css b/trunk/css/default/login.css
index 9f153263..98e2c8d3 100644
--- a/trunk/css/default/login.css
+++ b/trunk/css/default/login.css
@@ -54,7 +54,7 @@ dl.loginform {
   margin-left:            1em;
 }
 
-#LSsession_recoverPassword {
+a.LSsession_recoverPassword {
   float:                  right;
   font-size:              0.8em;
   text-decoration:        none;
diff --git a/trunk/includes/js/LSsession_login.js b/trunk/includes/js/LSsession_login.js
index 14c641e3..cc1b8114 100644
--- a/trunk/includes/js/LSsession_login.js
+++ b/trunk/includes/js/LSsession_login.js
@@ -4,7 +4,7 @@ var LSsession_login = new Class({
       if ( ! this.select_ldapserver ) 
         return;
       this.loading_zone = $('loading_zone');
-      this.recoverPassword = $('LSsession_recoverPassword');
+      this.recoverPasswordElements = $$('.LSsession_recoverPassword');
       this.select_ldapserver.addEvent('change',this.onLdapServerChanged.bind(this));
       this.onLdapServerChanged();
     },
@@ -51,10 +51,14 @@ var LSsession_login = new Class({
           this.loginformLevelHide();
         }
         if (data.recoverPassword) {
-          this.recoverPassword.removeClass('LSsession_recoverPassword_hidden');
+          this.recoverPasswordElements.each(function(el) {
+            el.removeClass('LSsession_recoverPassword_hidden');
+          },this);
         }
         else {
-          this.recoverPassword.addClass('LSsession_recoverPassword_hidden');
+          this.recoverPasswordElements.each(function(el) {
+            el.addClass('LSsession_recoverPassword_hidden');
+          },this);
         }
       }
       else {
diff --git a/trunk/templates/default/login.tpl b/trunk/templates/default/login.tpl
index 03c84370..6d793b8f 100644
--- a/trunk/templates/default/login.tpl
+++ b/trunk/templates/default/login.tpl
@@ -35,7 +35,7 @@
   <dd><input type='submit' value='{$loginform_label_submit}' /></dd>
 </dl>
 </form>
-<a href='index.php?LSsession_recoverPassword' id='LSsession_recoverPassword'>{$loginform_label_recoverPassword}</a>
+<a href='index.php?LSsession_recoverPassword' class='LSsession_recoverPassword'>{$loginform_label_recoverPassword}</a>
 </div>
 </body>
 </html>