diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index ddaabe102..785b07bb0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -143,18 +143,18 @@
                 const tag = tags[i]
                 tag.onclick = function(e) {
                     const field = e.target.parentElement.id === 'suggest-lastname' ? document.getElementById('lastname-field') : document.getElementById('firstname-field')
+                    const suggestion = e.target.parentElement.id === 'suggest-lastname' ? e.target.textContent.toUpperCase() : e.target.textContent
 
                     if (field.value === '') {
-                        field.value = e.target.textContent;
+                        field.value = suggestion;
                     } else {
-                        field.value = `${field.value} ${e.target.textContent}`
+                        field.value = `${field.value} ${suggestion}`
                     }
                     e.target.style.display = "none";
 
                     [...document.querySelectorAll("p")]
                         .filter(p => p.textContent.includes(e.target.textContent))
                         .forEach(p => p.style.display = "none")
-
                 }
             }
     </script>