diff --git a/invite.go b/invite.go
index d9e50e7..07cb6f9 100644
--- a/invite.go
+++ b/invite.go
@@ -149,7 +149,7 @@ func handleNewAccount(w http.ResponseWriter, r *http.Request, l *ldap.Conn, invi
 		// tryCreateAccount(l, data, password1, password2, invitedBy)
 
 	} else {
-		data.SuggestPW = suggestPassword()
+		data.SuggestPW = fmt.Sprint("%s", suggestPassword())
 	}
 
 	templateInviteNewAccount.Execute(w, data)
diff --git a/templates/invite_new_account.html b/templates/invite_new_account.html
index d791721..143131d 100644
--- a/templates/invite_new_account.html
+++ b/templates/invite_new_account.html
@@ -62,7 +62,7 @@
     <label for="surname">Nom de famille :</label>
     <input type="text" id="surname" name="surname" class="form-control" value="{{ .Surname }}" />
   </div>
-  <p><a href="#" onClick="javascript:document.getElementById('password').value='{{ .SuggestPW }}';document.getElementById('password2').value='{{ .SuggestPW }}';">Utiliser ce mot de passe :</a> <pre>{{ .SuggestPW }}</pre></p>
+  <p><a href="#" onClick="javascript:var suggestPW = Math.random().toString(36).slice(-10); document.getElementById('password').value='{{ .SuggestPW }}';document.getElementById('password2').value='{{ .SuggestPW }}';">Générer un mot de passe :</a> <pre id="suggestPW">{{ .SuggestPW }}</pre></p>
   <div class="form-group">
     <label for="password">Mot de passe :</label>
     <input type="password" id="password" name="password" class="form-control" />