diff --git a/model-user.go b/model-user.go
index bac9a87..5d18219 100644
--- a/model-user.go
+++ b/model-user.go
@@ -164,8 +164,10 @@ func modify(user User, config *ConfigFile, ldapConn *ldap.Conn) error {
 func passwd(user User, config *ConfigFile, ldapConn *ldap.Conn) error {
 	passwordModifyRequest := ldap.NewPasswordModifyRequest(user.DN, "", user.Password)
 	_, err := ldapConn.PasswordModify(passwordModifyRequest)
-	log.Printf(fmt.Sprintf("passwd 162 : %v %v", err, ldapConn))
-	log.Printf(fmt.Sprintf("passwd 163 : %v", user))
+	if err != nil {
+		log.Printf(fmt.Sprintf("model-user passwd : %v %v", err, ldapConn))
+		log.Printf(fmt.Sprintf("model-user passwd : %v", user))
+	}
 	return err
 }
 
diff --git a/view-invite.go b/view-invite.go
index bb1ff03..cc79423 100644
--- a/view-invite.go
+++ b/view-invite.go
@@ -157,7 +157,7 @@ func handleNewAccount(w http.ResponseWriter, r *http.Request, l *ldap.Conn, invi
 		newUser.SN = strings.TrimSpace(strings.Join(r.Form["surname"], ""))
 		newUser.OtherMailbox = strings.TrimSpace(strings.Join(r.Form["othermailbox"], ""))
 		newUser.Mail = strings.TrimSpace(strings.Join(r.Form["mail"], ""))
-		newUser.UID = strings.TrimSpace(strings.Join(r.Form["othermailbox"], ""))
+		newUser.UID = strings.TrimSpace(strings.Join(r.Form["username"], ""))
 		newUser.CN = strings.TrimSpace(strings.Join(r.Form["username"], ""))
 		newUser.DN = "cn=" + strings.TrimSpace(strings.Join(r.Form["username"], "")) + "," + config.UserBaseDN