diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml
index 08416b69f..5371d576d 100644
--- a/data/actionsmap/yunohost.yml
+++ b/data/actionsmap/yunohost.yml
@@ -172,7 +172,9 @@ user:
                     nargs: "*"
                     metavar: MAIL
                     extra:
-                        pattern: *pattern_email
+                        pattern: &pattern_email_forward
+                            - !!str ^[\w\+.-]+@([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+((xn--)?[^\W_]{2,})$
+                            - "pattern_email_forward"
                 --remove-mailforward:
                     help: Mailforward addresses to remove
                     nargs: "*"
diff --git a/locales/en.json b/locales/en.json
index 1a620124b..115928001 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -468,7 +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 (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",