diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml
index 72b30328c..7be0e0899 100644
--- a/data/actionsmap/yunohost.yml
+++ b/data/actionsmap/yunohost.yml
@@ -103,9 +103,9 @@ user:
                     extra:
                         ask: ask_email
                         required: True
-                        pattern: &pattern_email_without_plus
+                        pattern: &pattern_email
                             - !!str ^[\w.-]+@([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+([^\W\d_]{2,})$
-                            - "pattern_email_without_plus"
+                            - "pattern_email"
                 -p:
                     full: --password
                     help: User password
@@ -164,7 +164,7 @@ user:
                 -m:
                     full: --mail
                     extra:
-                        pattern: *pattern_email_without_plus
+                        pattern: *pattern_email
                 -p:
                     full: --change-password
                     help: New password to set
@@ -176,9 +176,9 @@ user:
                     nargs: "*"
                     metavar: MAIL
                     extra:
-                        pattern: &pattern_email
+                        pattern: &pattern_email_forward
                             - !!str ^[\w\+.-]+@([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+([^\W\d_]{2,})$
-                            - "pattern_email"
+                            - "pattern_email_forward"
                 --remove-mailforward:
                     help: Mailforward addresses to remove
                     nargs: "*"
@@ -188,7 +188,7 @@ user:
                     nargs: "*"
                     metavar: MAIL
                     extra:
-                        pattern: *pattern_email_without_plus
+                        pattern: *pattern_email
                 --remove-mailalias:
                     help: Mail aliases to remove
                     nargs: "*"
diff --git a/locales/en.json b/locales/en.json
index e832b5ec8..115928001 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -468,8 +468,8 @@
     "password_too_simple_4": "The password needs to be at least 12 characters long and contain a digit, upper, lower and special characters",
     "pattern_backup_archive_name": "Must be a valid filename with max 30 characters, alphanumeric and -_. characters only",
     "pattern_domain": "Must be a valid domain name (e.g. my-domain.org)",
-    "pattern_email": "Must be a valid e-mail address, '+' symbol accepted(e.g. someone+tag@example.com)",
-    "pattern_email_without_plus": "Must be a valid e-mail address without '+' symbol (e.g. someone@example.com)",
+    "pattern_email_forward": "Must be a valid e-mail address, '+' symbol accepted (e.g. someone+tag@example.com)",
+    "pattern_email": "Must be a valid e-mail address, without '+' symbol (e.g. someone@example.com)",
     "pattern_firstname": "Must be a valid first name",
     "pattern_lastname": "Must be a valid last name",
     "pattern_mailbox_quota": "Must be a size with b/k/M/G/T suffix or 0 to not have a quota",