diff --git a/roles/ynh_setup/README-FR.md b/roles/ynh_setup/README-FR.md
index 277243b..af14c16 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 950b805..f5e1f71 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 7b26b6c..fad9e9b 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 e13f7ce..84cbc56 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 }}"