diff --git a/templates/invite_new_account.html b/templates/invite_new_account.html
index 85dbed4..ca3ba1b 100644
--- a/templates/invite_new_account.html
+++ b/templates/invite_new_account.html
@@ -101,6 +101,7 @@ function changeGivenNameOrSurname () {
   displayname = document.getElementById("displayname");
   username = document.getElementById("username");
   displayname.value = givenname.value + " " + surname.value
+  changeDisplayname();
 }
 function changeDisplayname () {
   givenname = document.getElementById("givenname");
@@ -108,6 +109,7 @@ function changeDisplayname () {
   displayname = document.getElementById("displayname");
   username = document.getElementById("username");
   username.value = displayname.value.toLowerCase().replace(/[^A-z0-9.-]/g, '').replace(/^[.-]/, '').replace(/[.-]$/, '');
+  changeUsername();
 }
 function changeUsername () {
   givenname = document.getElementById("givenname");
@@ -117,8 +119,10 @@ function changeUsername () {
   mail = document.getElementById("mail");
   mail.value = username.value + "@lesgv.com";
 }
-document.getElementById("username").addEventListener("change",changeUsername);
+document.getElementById("givenname").addEventListener("change",changeGivenNameOrSurname);
+document.getElementById("surname").addEventListener("change",changeGivenNameOrSurname);
 document.getElementById("displayname").addEventListener("change",changeDisplayname);
+document.getElementById("username").addEventListener("change",changeUsername);
 </script>
 {{end}}
 {{end}}
\ No newline at end of file