diff --git a/gpas.go b/gpas.go
index 28746cf..a48275e 100644
--- a/gpas.go
+++ b/gpas.go
@@ -34,7 +34,7 @@ func passwordLost(user User, config *ConfigFile, ldapConn *ldap.Conn) error {
 	}
 	searchFilter := "(|"
 	if user.CN != "" {
-		searchFilter += "(cn=" + user.CN + ")"
+		searchFilter += "(cn=" + user.UID + ")"
 	}
 	if user.Mail != "" {
 		searchFilter += "(mail=" + user.Mail + ")"
@@ -57,6 +57,10 @@ func passwordLost(user User, config *ConfigFile, ldapConn *ldap.Conn) error {
 	}
 	log.Printf(fmt.Sprintf("passwordLost : %v", user))
 	log.Printf(fmt.Sprintf("passwordLost : %v", searchRes.Entries[0]))
+	log.Printf(fmt.Sprintf("passwordLost : %v", searchRes.Entries[0].GetAttributeValue("cn")))
+	log.Printf(fmt.Sprintf("passwordLost : %v", searchRes.Entries[0].GetAttributeValue("uid")))
+	log.Printf(fmt.Sprintf("passwordLost : %v", searchRes.Entries[0].GetAttributeValue("mail")))
+	log.Printf(fmt.Sprintf("passwordLost : %v", searchRes.Entries[0].GetAttributeValue("carLicense")))
 	// Préparation du courriel à envoyer
 	user.Password = suggestPassword()
 	code := b64.URLEncoding.EncodeToString([]byte(user.UID + ";" + user.Password))
diff --git a/invite.go b/invite.go
index 914cbd0..b5a32f6 100644
--- a/invite.go
+++ b/invite.go
@@ -82,9 +82,10 @@ func handleLostPassword(w http.ResponseWriter, r *http.Request) {
 		data.Mail = strings.TrimSpace(strings.Join(r.Form["mail"], ""))
 		data.OtherMailbox = strings.TrimSpace(strings.Join(r.Form["othermailbox"], ""))
 		user := User{
-			CN:           data.Username,
-			Mail:         data.Mail,
-			OtherMailbox: data.OtherMailbox,
+			CN:           strings.TrimSpace(strings.Join(r.Form["username"], "")),
+			UID:          strings.TrimSpace(strings.Join(r.Form["username"], "")),
+			Mail:         strings.TrimSpace(strings.Join(r.Form["mail"], "")),
+			OtherMailbox: strings.TrimSpace(strings.Join(r.Form["othermailbox"], "")),
 		}
 		ldapConn, err := openNewUserLdap(config)
 		if err != nil {