diff --git a/lib/AccountManager/App/Controller.pm b/lib/AccountManager/App/Controller.pm
index 82c5c11871051bbc73657c3a1a3d674caaf9d9b0..4c86d2def5bef4a3dec9371c07e72b9e8db72975 100644
--- a/lib/AccountManager/App/Controller.pm
+++ b/lib/AccountManager/App/Controller.pm
@@ -138,8 +138,8 @@ sub get_sp {
     }x;
 
     return $self->abort(
-        log_message  => "Incorrect parameter format: entityid",
-        user_message => "format_entityid"
+        log_message  => "Invalid parameter: entityid",
+        user_message => "invalid_entityid"
     ) if $entityid !~ $pattern;
 
     my $db = $self->stash('db');
diff --git a/lib/AccountManager/L10N/fr.pm b/lib/AccountManager/L10N/fr.pm
index f62dfe65bdbfae830ca5962603172c02323e2eec..b8e1086d96e2d3ced01c41fec7cfe44ee4d948c2 100644
--- a/lib/AccountManager/L10N/fr.pm
+++ b/lib/AccountManager/L10N/fr.pm
@@ -296,6 +296,10 @@ msgstr "Les attributs eduPersonAffiliation et eduPersonScopedAffiliation sont va
 #: templates/web/edugain/errors.tt2.html:12 templates/web/renater/errors.tt2.html:12
 msgid "internal error"
 msgstr "erreur interne"
+#. (matches.0)
+#: templates/web/edugain/errors.html.tt2:35
+msgid "invalid parameter '%1'"
+msgstr "paramètre invalide '%1'"
 
 #: templates/web/edugain/errors.tt2.html:15 templates/web/renater/errors.tt2.html:15
 msgid "mail notification failure"
diff --git a/templates/web/edugain/errors.html.tt2 b/templates/web/edugain/errors.html.tt2
index 5dd4f96b7dbdd7e9435781982a71ae7c0698cff4..8ab9a273f6431ee22c7673366e347de871cc5127 100644
--- a/templates/web/edugain/errors.html.tt2
+++ b/templates/web/edugain/errors.html.tt2
@@ -31,8 +31,11 @@
         [% ELSIF (matches = error.match('missing_(\w+)')) %]
         [% c.loc("missing parameter '[_1]'", matches.0) %]
 
+        [% ELSIF (matches = error.match('invalid_(\w+)')) %]
+        [% c.loc("invalid parameter '[_1]'", matches.0) %]
+
         [% ELSE %]
-        [% err %]
+        [% error %]
 
         [% END %]
     </p>
diff --git a/templates/web/renater/errors.html.tt2 b/templates/web/renater/errors.html.tt2
index a9ad75fc92c3243476dbb8397aa95aa6ffae9253..66119424a892c443c4c5895d07918b0925975169 100644
--- a/templates/web/renater/errors.html.tt2
+++ b/templates/web/renater/errors.html.tt2
@@ -28,8 +28,11 @@
         [% ELSIF (matches = error.match('missing_(\w+)')) %]
         [% c.loc("missing parameter '[_1]'", matches.0) %]
 
+	[% ELSIF (matches = error.match('invalid_(\w+)')) %]
+        [% c.loc("invalid parameter '[_1]'", matches.0) %]
+
         [% ELSE %]
-        [% err %]
+        [% error %]
 
         [% END %]
     </p>