diff --git a/src/utils/legacy.py b/src/utils/legacy.py
index 35112724f..3334632c2 100644
--- a/src/utils/legacy.py
+++ b/src/utils/legacy.py
@@ -254,8 +254,8 @@ def _patch_legacy_helpers(app_folder):
         "yunohost tools port-available": {"important": True},
         "yunohost app checkurl": {"important": True},
         "yunohost user create": {
-            "pattern": r"yunohost user create \S+ (-f|--firstname) (\S+) (-l|--lastname) \S+ (.*)",
-            "replace": r"yunohost user create --fullname \2 \4",
+            "pattern": r"yunohost user create (\S+) (-f|--firstname) (\S+) (-l|--lastname) \S+ (.*)",
+            "replace": r"yunohost user create \1 --fullname \3 \5",
             "important": False,
         },
         # Remove