diff --git a/lib/AccountManager/Account.pm b/lib/AccountManager/Account.pm
index e1d33e6ee16830bd970649bf98d67fdcd3d4ceca..949b148f92e4ed5eab2304a0c412d8f536c65e5f 100644
--- a/lib/AccountManager/Account.pm
+++ b/lib/AccountManager/Account.pm
@@ -96,17 +96,17 @@ my %scopedAffiliation = (
 );
 
 my %comment = (
-    alumni1        => 'An ex-student with "alum" value for eduPersonAffiliation.',
-    employee1      => 'A person with "member", "staff" and "employee" values for eduPersonAffiliation.',
-    fullset1       => 'A person with all eduGAIN user attributes plus givenName and surname.',
-    limitedset1    => 'A person with only an eduPersonTargetedID attribute.',
-    generic1       => 'A person with a limited set of attributes (eduPersonPrincipalName, mail and displayName).',
-    librarywalkin1 => 'A library user on the campus network.',
-    student1       => 'A student with "member" and "student" values for eduPersonAffiliation.',
-    student2       => 'A PhD student with "member", "student" and "faculty" values for eduPersonAffiliation.',
-    teacher1       => 'A teacher with a limited set of attributes (eduPersonScopedAffiliation and eduPersonTargetedID).',
-    teacher2       => 'A teacher with "member" and "faculty" values for eduPersonAffiliation.',
-    researcher1    => 'A researcher, undifferenciable from a teacher as there is no standard value for eduPersonAffiliation.',
+    alumni1        => "An ex-student with 'alum' value for eduPersonAffiliation.",
+    employee1      => "A person with 'member', 'staff' and 'employee' values for eduPersonAffiliation.",
+    fullset1       => "A person with all eduGAIN user attributes plus givenName and surname.",
+    limitedset1    => "A person with only an eduPersonTargetedID attribute.",
+    generic1       => "A person with a limited set of attributes (eduPersonPrincipalName, mail and displayName).",
+    librarywalkin1 => "A library user on the campus network.",
+    student1       => "A student with 'member' and 'student' values for eduPersonAffiliation.",
+    student2       => "A PhD student with 'member', 'student' and 'faculty' values for eduPersonAffiliation.",
+    teacher1       => "A teacher with a limited set of attributes (eduPersonScopedAffiliation and eduPersonTargetedID).",
+    teacher2       => "A teacher with 'member' and 'faculty' values for eduPersonAffiliation.",
+    researcher1    => "A researcher, undifferenciable from a teacher as there is no standard value for eduPersonAffiliation.",
 );
 
 sub print {
diff --git a/lib/AccountManager/L10N/fr.pm b/lib/AccountManager/L10N/fr.pm
index c369f1f5417526201a1b3ec1c6201e92583be531..e2dd10097ed1654dadf1b39161e2ff00f68d3ce5 100644
--- a/lib/AccountManager/L10N/fr.pm
+++ b/lib/AccountManager/L10N/fr.pm
@@ -17,6 +17,39 @@ __DATA__
 msgid "_AUTO"
 msgstr "1"
 
+msgid "An ex-student with 'alum' value for eduPersonAffiliation."
+msgstr "Un ancient étudiant avec la valeur 'alum' pour eduPersonAffiliation."
+
+msgid "A person with 'member', 'staff' and 'employee' values for eduPersonAffiliation."
+msgstr "Une personne avec les valeurs 'member', 'staff' et 'employee' pour eduPersonAffiliation."
+
+msgid "A person with all eduGAIN user attributes plus givenName and surname."
+msgstr "Une personne avec tous les attributs eduGAIN plus givenName et surname."
+
+msgid "A person with only an eduPersonTargetedID attribute."
+msgstr "Une personne avec uniquement un attribut eduPersonTargetedID."
+
+msgid "A person with a limited set of attributes (eduPersonPrincipalName, mail and displayName)."
+msgstr "Une personne avec un ensembe d'attributs limités (eduPersonPrincipalName, mail et displayName)."
+
+msgid "A library user on the campus network."
+msgstr "Un utilisateur de la bibliothèque sur le réseau du campus."
+
+msgid "A student with 'member' and 'student' values for eduPersonAffiliation."
+msgstr "Un étudiant avec les valeurs 'member' et 'student' pour eduPersonAffiliation."
+
+msgid "A PhD student with 'member', 'student' and 'faculty' values for eduPersonAffiliation."
+msgstr "Un étudiant en thèse avec les valeurs 'member', 'student' et 'faculty' pour eduPersonAffiliation."
+
+msgid "A teacher with a limited set of attributes (eduPersonScopedAffiliation and eduPersonTargetedID)."
+msgstr "Un enseignant avec un ensemble d'attributs limités (eduPersonScopedAffiliation and eduPersonTargetedID)."
+
+msgid "A teacher with 'member' and 'faculty' values for eduPersonAffiliation."
+msgstr "Un enseignant avec les valeurs 'member' et 'faculty' pour eduPersonAffiliation."
+
+msgid "A researcher, undifferenciable from a teacher as there is no standard value for eduPersonAffiliation."
+msgstr "Un chercheur, indifférenciable d'un enseignant car il n'y a pas de valeur standard pour eduPersonAffiliation."
+
 #: templates/web/edugain/create_accounts.tt2.html:74 templates/web/renater/create_accounts.tt2.html:78
 msgid "(1) eduPersonAffiliation and eduPersonScoppedAffilisation attributes are assigned quite differently from federation to federation."
 msgstr "(1) les attributs eduPersonAffiliation et eduPersonScoppedAffilisation sont valorisés différement d'une fédération à une autre."
diff --git a/templates/web/edugain/create_accounts.tt2.html b/templates/web/edugain/create_accounts.tt2.html
index e3753d3e77b2d48c2ca0741dcd0ee1bfb83549c2..36ba8eb1fc209cbfd6f9e419da7d40e9b4938b4f 100644
--- a/templates/web/edugain/create_accounts.tt2.html
+++ b/templates/web/edugain/create_accounts.tt2.html
@@ -31,7 +31,7 @@
                 <tr>
                     <td colspan="2">
                         <strong>[% lh.maketext("comment:") %]</strong>
-                        <div class="comment">[% account.comment() %]</div>
+                        <div class="comment">[% lh.maketext(account.comment()) %]</div>
                     </td>
                 </tr>
                 <tr>
diff --git a/templates/web/renater/create_accounts.tt2.html b/templates/web/renater/create_accounts.tt2.html
index 854818881f009eae0f31bab9ce68ad3e1389af69..6c2f2b831f966cca946d2508b01ba671b9324c58 100644
--- a/templates/web/renater/create_accounts.tt2.html
+++ b/templates/web/renater/create_accounts.tt2.html
@@ -33,7 +33,7 @@
                 <tr>
                     <td colspan="2">
                         <strong>[% lh.maketext("comment:") %]</strong>
-                        <div class="comment">[% account.comment() %]</div>
+                        <div class="comment">[% lh.maketext(account.comment()) %]</div>
                     </td>
                 </tr>
                 <tr>