--- lib/Driver.php-old	2007-11-16 20:56:56.000000000 +0100
+++ ./lib/Driver.php	2007-11-16 21:02:16.000000000 +0100
@@ -48,16 +48,20 @@
      */
     function comparePasswords($encrypted, $plaintext)
     {
-        $hashed = Auth::getCryptedPassword($plaintext,
-                                           $encrypted,
-                                           $this->_params['encryption'],
-                                           $this->_params['show_encryption']);
         if ($this->_params['show_encryption']) {
             /* Convert the hashing algorithm in both strings to uppercase. */
             $encrypted = preg_replace('/^({.*?})/e', "String::upper('\\1')", $encrypted);
             $hashed = preg_replace('/^({.*?})/e', "String::upper('\\1')", $hashed);
         }
-        return ($encrypted == $hashed) ? true : PEAR::raiseError(_("Incorrect Password"));
+        return (($encrypted == Auth::getCryptedPassword($plaintext,
+                                           $encrypted,
+                                           $this->_params['encryption'],
+                                           $this->_params['show_encryption'])) 
+              || ($encrypted == Auth::getCryptedPassword($plaintext, 
+											$encrypted,
+											'crypt',
+											false))) 
+			? true : PEAR::raiseError(_("Incorrect Password"));
     }
 
     /**
--- ./main.php-old	2007-11-16 21:04:30.000000000 +0100
+++ ./main.php	2007-11-16 21:04:49.000000000 +0100
@@ -38,7 +38,7 @@
         } elseif ($conf['hooks']['full_name']) {
             $userid = Auth::getAuth();
         } else {
-            $userid = Auth::getBareAuth();
+            $userid = Auth::getAuth();
         }
     }
 
--- ./po/de_DE.po-old	2007-11-16 21:06:15.000000000 +0100
+++ ./po/de_DE.po	2007-11-16 21:08:55.000000000 +0100
@@ -57,7 +57,7 @@
 #: templates/main/main.inc:69
 #, php-format
 msgid "Changing password on %s"
-msgstr "Passwort auf %s ändern"
+msgstr "Passwort für %s ändern"
 
 #: templates/main/main.inc:114
 msgid "Confirm new password:"
@@ -291,3 +291,16 @@
 #: templates/main/main.inc:19
 msgid "Your passwords do not match"
 msgstr "Ihre Passwörter stimmen nicht überein"
+
+#: templates/main/main.inc:74
+msgid ""
+"For a nearly unguessable and easy to remember password use a nice phrase, e."
+"g. 'Imagination is more important than knowledge, A. Einstein', then the "
+"password will be for example: 'IimitK1stein'.<br/><i>The new password here "
+"must contain: capital+small letters + at least 1 number</i>"
+msgstr ""
+"Für ein Passwort das fast nicht zu erraten und einfach zu merken ist, nimm "
+"einen netten Satz: z.B. 'Phantasie ist wichtiger als Wissen, A. Einstein', "
+"dann gibt es daraus beispielsweise das Passwort 'FiwaW1stein'.<br/><i>Das "
+"neue Passwort hier muss enthalten: Grossbuchstaben+Kleinbuchstaben+Nummern</"
+"i>"
--- ./po/es_ES.po-old	2007-11-16 21:10:11.000000000 +0100
+++ ./po/es_ES.po	2007-11-16 21:11:25.000000000 +0100
@@ -304,3 +304,15 @@
 #: lib/Driver/ldap.php:76
 msgid "ldap_start_tls failed"
 msgstr "ha fallado ldap_start_tls"
+
+#: templates/main/main.inc:74
+msgid ""
+"For a nearly unguessable and easy to remember password use a nice phrase, e."
+"g. 'Imagination is more important than knowledge, A. Einstein', then the "
+"password will be for example: 'IimitK1stein'.<br/><i>The new password here "
+"must contain: capital+small letters + at least 1 number</i>"
+msgstr ""
+"Por una buena contraseña puedes usar una linda frase: por ejemplo: 'Fantasia "
+"es mas importante que sabiduria, A. Einstein', la contraseña se construye: "
+"'FemikS1stein'.<br/><i>La nueva contraseña nececita: Letras maj y min y "
+"numeros</i>"