diff --git a/roles/ynh_setup/README-FR.md b/roles/ynh_setup/README-FR.md
index 277243bc57bf74f29a090a8a5d92d0a2b0f9e330..af14c1635cc4461c1c5edf96bf9e6b37c0f58e4c 100644
--- a/roles/ynh_setup/README-FR.md
+++ b/roles/ynh_setup/README-FR.md
@@ -65,8 +65,7 @@ ynh_ignore_dyndns_server: False
 ynh_users:
    - name: user1
      pass: MYINSECUREPWD_PLZ_OVERRIDE_THIS
-     firstname: Jane
-     lastname: Doe
+     fullname: Jane DOE
      mail_domain: domain.tld 
 ```
 
diff --git a/roles/ynh_setup/README.md b/roles/ynh_setup/README.md
index 950b8053528185cf51f7c34a18915198da318d76..f5e1f71bfa773f91e91e9da4bc4a319e1e5a28bb 100644
--- a/roles/ynh_setup/README.md
+++ b/roles/ynh_setup/README.md
@@ -65,8 +65,7 @@ ynh_ignore_dyndns_server: False
 ynh_users:
    - name: user1
      pass: MYINSECUREPWD_PLZ_OVERRIDE_THIS
-     firstname: Jane
-     lastname: Doe
+     fullname: Jane DOE
      mail_domain: domain.tld
 ```
 
diff --git a/roles/ynh_setup/defaults/main.yml b/roles/ynh_setup/defaults/main.yml
index 7b26b6ce71b57509d22407b21f370cb179640bdf..fad9e9b411e58709baf732bce2d3a2b88e7f6219 100644
--- a/roles/ynh_setup/defaults/main.yml
+++ b/roles/ynh_setup/defaults/main.yml
@@ -47,6 +47,5 @@ ynh_ignore_dyndns_server: False
 ynh_users: null
   # - name: user1
   #   pass: p@ssw0rd
-  #   firstname: Jane
-  #   lastname: Doe
+  #   fullname: Jane DOE
   #   mail_domain: domain.tld
diff --git a/roles/ynh_setup/tasks/users.yml b/roles/ynh_setup/tasks/users.yml
index e13f7ce8d10dc0377610aafd7e189ca3a8b2efe2..84cbc56eff2a1f766dc7ef22f9c03feadc9faa2e 100644
--- a/roles/ynh_setup/tasks/users.yml
+++ b/roles/ynh_setup/tasks/users.yml
@@ -35,8 +35,7 @@
 - name: Create missing Yunohost users
   ansible.builtin.command:
     yunohost user create "{{ item.name }}" \
-    -f "{{ item.firstname }}" \
-    -l "{{ item.lastname }}" \
+    -F "{{ item.fullname }}" \
     -d "{{ item.mail_domain }}" \
     -p "{{ item.pass }}"
   loop: "{{ ynh_users }}"