diff --git a/lib/graphql/resolvers/user.ex b/lib/graphql/resolvers/user.ex
index e08f413ce..55330e67b 100644
--- a/lib/graphql/resolvers/user.ex
+++ b/lib/graphql/resolvers/user.ex
@@ -358,13 +358,15 @@ defmodule Mobilizon.GraphQL.Resolvers.User do
 
       {:error, %Ecto.Changeset{errors: [password: {"registration.error.password_too_short", _}]}} ->
         {:error,
-         gettext(
-           "The password you have choosen is too short. Please make sure your password contains at least 6 charaters."
+         dgettext(
+           "errors",
+           "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
          )}
 
       {:error, _err} ->
         {:error,
-         gettext(
+         dgettext(
+           "errors",
            "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got."
          )}
     end
diff --git a/lib/web/templates/email/group_suspension.html.heex b/lib/web/templates/email/group_suspension.html.heex
index b1baacfcc..828bb7c6f 100644
--- a/lib/web/templates/email/group_suspension.html.heex
+++ b/lib/web/templates/email/group_suspension.html.heex
@@ -65,7 +65,7 @@
           >
             <p style="margin: 0">
               <%= gettext(
-                "As this group was located on this instance, all of it's data has been irretrievably deleted."
+                "As this group was located on this instance, all of its data has been irretrievably deleted."
               ) %>
             </p>
           </td>
diff --git a/lib/web/templates/email/group_suspension.text.eex b/lib/web/templates/email/group_suspension.text.eex
index ef74c48b6..8b5e9f171 100644
--- a/lib/web/templates/email/group_suspension.text.eex
+++ b/lib/web/templates/email/group_suspension.text.eex
@@ -2,7 +2,7 @@
 ==
 <%= gettext "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group.", group_name: @group.name, group_address: preferred_username_and_domain(@group) %>
 <%= if is_nil(@group.domain) do %>
-  <%= gettext "As this group was located on this instance, all of it's data has been irretrievably deleted." %>
+  <%= gettext "As this group was located on this instance, all of its data has been irretrievably deleted." %>
 <% else %>
   <%= gettext "As this group was located on another instance, it will continue to work for other instances than this one." %>
 <% end %>
diff --git a/priv/gettext/activity.pot b/priv/gettext/activity.pot
index bef479bbc..0f2686c58 100644
--- a/priv/gettext/activity.pot
+++ b/priv/gettext/activity.pot
@@ -453,3 +453,15 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "%{profile} approved the member %{member}."
 msgstr ""
+
+#: lib/service/activity/renderer/event.ex:74
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:55
+#: lib/web/templates/email/activity/_event_activity_item.text.eex:31
+#, elixir-autogen, elixir-format
+msgid "%{profile} joined your event %{event}."
+msgstr ""
+
+#: lib/web/views/email_view.ex:45
+#, elixir-autogen, elixir-format
+msgid "An anonymous profile"
+msgstr ""
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 217d396cb..350e208e8 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -3,7 +3,7 @@
 msgid "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one."
 msgstr ""
 
-#: lib/web/templates/email/report.html.heex:120
+#: lib/web/templates/email/report.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "%{title} by %{creator}"
 msgstr ""
@@ -19,23 +19,17 @@ msgstr ""
 msgid "Ask the community on Framacolibri"
 msgstr ""
 
-#: lib/web/templates/email/report.text.eex:15
+#: lib/web/templates/email/report.text.eex:17
 #, elixir-autogen, elixir-format
 msgid "Comments"
 msgstr ""
 
-#: lib/web/templates/email/report.html.heex:115
-#: lib/web/templates/email/report.text.eex:11
-#, elixir-autogen, elixir-format
-msgid "Event"
-msgstr ""
-
 #: lib/web/email/user.ex:49
 #, elixir-autogen, elixir-format
 msgid "Instructions to reset your password on %{instance}"
 msgstr ""
 
-#: lib/web/templates/email/report.text.eex:21
+#: lib/web/templates/email/report.text.eex:23
 #, elixir-autogen, elixir-format
 msgid "Reason"
 msgstr ""
@@ -295,12 +289,12 @@ msgctxt "terms"
 msgid "What information do we collect?"
 msgstr ""
 
-#: lib/web/email/user.ex:182
+#: lib/web/email/user.ex:188
 #, elixir-autogen, elixir-format
 msgid "Mobilizon on %{instance}: confirm your email address"
 msgstr ""
 
-#: lib/web/email/user.ex:159
+#: lib/web/email/user.ex:165
 #, elixir-autogen, elixir-format
 msgid "Mobilizon on %{instance}: email changed"
 msgstr ""
@@ -791,7 +785,7 @@ msgstr ""
 msgid "Event update!"
 msgstr ""
 
-#: lib/web/templates/email/report.html.heex:155
+#: lib/web/templates/email/report.html.heex:158
 #, elixir-autogen, elixir-format
 msgid "Flagged comments"
 msgstr ""
@@ -872,7 +866,7 @@ msgstr ""
 msgid "New email confirmation"
 msgstr ""
 
-#: lib/web/templates/email/report.html.heex:191
+#: lib/web/templates/email/report.html.heex:194
 #, elixir-autogen, elixir-format
 msgid "Reasons for report"
 msgstr ""
@@ -927,12 +921,12 @@ msgstr ""
 msgid "Verify your email address"
 msgstr ""
 
-#: lib/web/templates/email/report.html.heex:232
+#: lib/web/templates/email/report.html.heex:235
 #, elixir-autogen, elixir-format
 msgid "View report"
 msgstr ""
 
-#: lib/web/templates/email/report.text.eex:24
+#: lib/web/templates/email/report.text.eex:26
 #, elixir-autogen, elixir-format
 msgid "View report:"
 msgstr ""
@@ -1030,12 +1024,6 @@ msgstr ""
 msgid "As this group was located on another instance, it will continue to work for other instances than this one."
 msgstr ""
 
-#: lib/web/templates/email/group_suspension.html.heex:67
-#: lib/web/templates/email/group_suspension.text.eex:5
-#, elixir-autogen, elixir-format
-msgid "As this group was located on this instance, all of it's data has been irretrievably deleted."
-msgstr ""
-
 #: lib/web/templates/email/group_suspension.html.heex:18
 #: lib/web/templates/email/group_suspension.text.eex:1
 #, elixir-autogen, elixir-format
@@ -1047,7 +1035,7 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#: lib/web/email/group.ex:107
+#: lib/web/email/group.ex:108
 #, elixir-autogen, elixir-format
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
@@ -1329,12 +1317,12 @@ msgstr ""
 msgid "Public feed for %{instance}"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:350
+#: lib/graphql/resolvers/user.ex:361
 #, elixir-autogen, elixir-format
 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters."
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:356
+#: lib/graphql/resolvers/user.ex:367
 #, elixir-autogen, elixir-format
 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got."
 msgstr ""
@@ -1362,63 +1350,63 @@ msgid "Your participation to %{event} on %{instance} has been cancelled!"
 msgstr ""
 
 #. File name template for exported list of participants. Should NOT contain spaces. Make sure the output is going to be something standardized that is acceptable as a file name on most systems.
-#: lib/service/export/participants/csv.ex:81
+#: lib/service/export/participants/csv.ex:97
 #: lib/service/export/participants/ods.ex:86
 #: lib/service/export/participants/pdf.ex:96
 #, elixir-autogen, elixir-format
 msgid "%{event}_participants"
 msgstr ""
 
-#: lib/service/export/participants/common.ex:61
+#: lib/service/export/participants/common.ex:66
 #, elixir-autogen, elixir-format
 msgid "Participant message"
 msgstr ""
 
-#: lib/service/export/participants/common.ex:61
+#: lib/service/export/participants/common.ex:63
 #, elixir-autogen, elixir-format
 msgid "Participant name"
 msgstr ""
 
-#: lib/service/export/participants/common.ex:61
+#: lib/service/export/participants/common.ex:64
 #, elixir-autogen, elixir-format
 msgid "Participant status"
 msgstr ""
 
-#: lib/service/export/participants/common.ex:52
+#: lib/service/export/participants/common.ex:53
 #: lib/web/templates/email/admin/_role.html.heex:3
 #: lib/web/templates/email/admin/_role.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "Administrator"
 msgstr ""
 
-#: lib/service/export/participants/common.ex:55
+#: lib/service/export/participants/common.ex:56
 #, elixir-autogen, elixir-format
 msgid "Creator"
 msgstr ""
 
-#: lib/service/export/participants/common.ex:49
+#: lib/service/export/participants/common.ex:50
 #: lib/web/templates/email/admin/_role.html.heex:5
 #: lib/web/templates/email/admin/_role.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "Moderator"
 msgstr ""
 
-#: lib/service/export/participants/common.ex:37
+#: lib/service/export/participants/common.ex:38
 #, elixir-autogen, elixir-format
 msgid "Not approved"
 msgstr ""
 
-#: lib/service/export/participants/common.ex:40
+#: lib/service/export/participants/common.ex:41
 #, elixir-autogen, elixir-format
 msgid "Not confirmed"
 msgstr ""
 
-#: lib/service/export/participants/common.ex:46
+#: lib/service/export/participants/common.ex:47
 #, elixir-autogen, elixir-format
 msgid "Participant"
 msgstr ""
 
-#: lib/service/export/participants/common.ex:43
+#: lib/service/export/participants/common.ex:44
 #, elixir-autogen, elixir-format
 msgid "Rejected"
 msgstr ""
@@ -1443,7 +1431,7 @@ msgstr ""
 msgid "Participants for %{event}"
 msgstr ""
 
-#: lib/service/export/participants/common.ex:88
+#: lib/service/export/participants/common.ex:95
 #, elixir-autogen, elixir-format
 msgid "Anonymous participant"
 msgstr ""
@@ -1562,7 +1550,7 @@ msgstr ""
 msgid "Title: %{title}"
 msgstr ""
 
-#: lib/web/email/group.ex:46
+#: lib/web/email/group.ex:47
 #, elixir-autogen, elixir-format
 msgid "📅 Just scheduled by %{group}: %{event}"
 msgstr ""
@@ -1975,3 +1963,24 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Until next time!"
 msgstr ""
+
+#: lib/web/templates/email/group_suspension.html.heex:67
+#: lib/web/templates/email/group_suspension.text.eex:5
+#, elixir-autogen, elixir-format
+msgid "As this group was located on this instance, all of its data has been irretrievably deleted."
+msgstr ""
+
+#: lib/web/templates/email/report.text.eex:11
+#, elixir-autogen, elixir-format
+msgid "Events"
+msgstr ""
+
+#: lib/web/templates/email/report.html.heex:115
+#, elixir-autogen, elixir-format
+msgid "Flagged events"
+msgstr ""
+
+#: lib/service/export/participants/common.ex:65
+#, elixir-autogen, elixir-format
+msgid "Participant registration date"
+msgstr ""
diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot
index 93145f052..5fcc77c0b 100644
--- a/priv/gettext/errors.pot
+++ b/priv/gettext/errors.pot
@@ -110,7 +110,7 @@ msgstr ""
 msgid "Current profile is not an administrator of the selected group"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:644
+#: lib/graphql/resolvers/user.ex:671
 #, elixir-autogen, elixir-format
 msgid "Error while saving user settings"
 msgstr ""
@@ -153,8 +153,8 @@ msgstr ""
 msgid "No user to validate with this email was found"
 msgstr ""
 
-#: lib/graphql/resolvers/person.ex:337
-#: lib/graphql/resolvers/user.ex:330
+#: lib/graphql/resolvers/person.ex:339
+#: lib/graphql/resolvers/user.ex:337
 #, elixir-autogen, elixir-format
 msgid "No user with this email was found"
 msgstr ""
@@ -162,12 +162,12 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:32
 #: lib/graphql/resolvers/participant.ex:210
-#: lib/graphql/resolvers/person.ex:245
-#: lib/graphql/resolvers/person.ex:376
-#: lib/graphql/resolvers/person.ex:412
-#: lib/graphql/resolvers/person.ex:419
-#: lib/graphql/resolvers/person.ex:448
-#: lib/graphql/resolvers/person.ex:463
+#: lib/graphql/resolvers/person.ex:247
+#: lib/graphql/resolvers/person.ex:378
+#: lib/graphql/resolvers/person.ex:414
+#: lib/graphql/resolvers/person.ex:421
+#: lib/graphql/resolvers/person.ex:450
+#: lib/graphql/resolvers/person.ex:465
 #, elixir-autogen, elixir-format
 msgid "Profile is not owned by authenticated user"
 msgstr ""
@@ -177,41 +177,41 @@ msgstr ""
 msgid "Registrations are not open"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:461
+#: lib/graphql/resolvers/user.ex:472
 #, elixir-autogen, elixir-format
 msgid "The current password is invalid"
 msgstr ""
 
-#: lib/graphql/resolvers/admin.ex:336
-#: lib/graphql/resolvers/user.ex:504
+#: lib/graphql/resolvers/admin.ex:334
+#: lib/graphql/resolvers/user.ex:525
 #, elixir-autogen, elixir-format
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
-#: lib/graphql/resolvers/admin.ex:339
-#: lib/graphql/resolvers/user.ex:507
+#: lib/graphql/resolvers/admin.ex:323
+#: lib/graphql/resolvers/user.ex:512
 #, elixir-autogen, elixir-format
 msgid "The new email must be different"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:464
+#: lib/graphql/resolvers/user.ex:475
 #, elixir-autogen, elixir-format
 msgid "The new password must be different"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:511
-#: lib/graphql/resolvers/user.ex:573
-#: lib/graphql/resolvers/user.ex:576
+#: lib/graphql/resolvers/user.ex:516
+#: lib/graphql/resolvers/user.ex:600
+#: lib/graphql/resolvers/user.ex:603
 #, elixir-autogen, elixir-format
 msgid "The password provided is invalid"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:468
+#: lib/graphql/resolvers/user.ex:479
 #, elixir-autogen, elixir-format
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:323
+#: lib/graphql/resolvers/user.ex:330
 #, elixir-autogen, elixir-format
 msgid "This user can't reset their password"
 msgstr ""
@@ -227,12 +227,12 @@ msgstr ""
 msgid "Unable to validate user"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:554
+#: lib/graphql/resolvers/user.ex:581
 #, elixir-autogen, elixir-format
 msgid "User already disabled"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:619
+#: lib/graphql/resolvers/user.ex:646
 #, elixir-autogen, elixir-format
 msgid "User requested is not logged-in"
 msgstr ""
@@ -257,12 +257,12 @@ msgstr ""
 msgid "You may not list groups unless moderator."
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:519
+#: lib/graphql/resolvers/user.ex:501
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:487
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to change your password"
 msgstr ""
@@ -272,7 +272,7 @@ msgstr ""
 msgid "You need to be logged-in to delete a group"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:581
+#: lib/graphql/resolvers/user.ex:608
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to delete your account"
 msgstr ""
@@ -297,12 +297,6 @@ msgstr ""
 msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:306
-#: lib/graphql/resolvers/user.ex:333
-#, elixir-autogen, elixir-format
-msgid "You requested again a confirmation email too soon"
-msgstr ""
-
 #: lib/graphql/resolvers/user.ex:180
 #, elixir-autogen, elixir-format
 msgid "Your email is not on the allowlist"
@@ -355,17 +349,17 @@ msgstr ""
 msgid "Anonymous participation is not enabled"
 msgstr ""
 
-#: lib/graphql/resolvers/person.ex:219
+#: lib/graphql/resolvers/person.ex:221
 #, elixir-autogen, elixir-format
 msgid "Cannot remove the last administrator of a group"
 msgstr ""
 
-#: lib/graphql/resolvers/person.ex:216
+#: lib/graphql/resolvers/person.ex:218
 #, elixir-autogen, elixir-format
 msgid "Cannot remove the last identity of a user"
 msgstr ""
 
-#: lib/graphql/resolvers/comment.ex:147
+#: lib/graphql/resolvers/comment.ex:153
 #, elixir-autogen, elixir-format
 msgid "Comment is already deleted"
 msgstr ""
@@ -393,8 +387,8 @@ msgid "Event id not found"
 msgstr ""
 
 #: lib/graphql/error.ex:114
-#: lib/graphql/resolvers/event.ex:355
-#: lib/graphql/resolvers/event.ex:407
+#: lib/graphql/resolvers/event.ex:382
+#: lib/graphql/resolvers/event.ex:434
 #, elixir-autogen, elixir-format
 msgid "Event not found"
 msgstr ""
@@ -402,7 +396,7 @@ msgstr ""
 #: lib/graphql/resolvers/participant.ex:87
 #: lib/graphql/resolvers/participant.ex:128
 #: lib/graphql/resolvers/participant.ex:155
-#: lib/graphql/resolvers/participant.ex:336
+#: lib/graphql/resolvers/participant.ex:343
 #, elixir-autogen, elixir-format
 msgid "Event with this ID %{id} doesn't exist"
 msgstr ""
@@ -412,7 +406,7 @@ msgstr ""
 msgid "Internal Error"
 msgstr ""
 
-#: lib/graphql/resolvers/discussion.ex:219
+#: lib/graphql/resolvers/discussion.ex:222
 #, elixir-autogen, elixir-format
 msgid "No discussion with ID %{id}"
 msgstr ""
@@ -479,10 +473,10 @@ msgstr ""
 #: lib/graphql/resolvers/post.ex:133
 #: lib/graphql/resolvers/post.ex:175
 #: lib/graphql/resolvers/post.ex:209
-#: lib/graphql/resolvers/resource.ex:90
-#: lib/graphql/resolvers/resource.ex:135
-#: lib/graphql/resolvers/resource.ex:168
-#: lib/graphql/resolvers/resource.ex:202
+#: lib/graphql/resolvers/resource.ex:92
+#: lib/graphql/resolvers/resource.ex:137
+#: lib/graphql/resolvers/resource.ex:170
+#: lib/graphql/resolvers/resource.ex:204
 #: lib/graphql/resolvers/todos.ex:58
 #: lib/graphql/resolvers/todos.ex:83
 #: lib/graphql/resolvers/todos.ex:110
@@ -494,7 +488,7 @@ msgid "Profile is not member of group"
 msgstr ""
 
 #: lib/graphql/resolvers/actor.ex:67
-#: lib/graphql/resolvers/person.ex:242
+#: lib/graphql/resolvers/person.ex:244
 #, elixir-autogen, elixir-format
 msgid "Profile not found"
 msgstr ""
@@ -504,8 +498,8 @@ msgstr ""
 msgid "Report not found"
 msgstr ""
 
-#: lib/graphql/resolvers/resource.ex:172
-#: lib/graphql/resolvers/resource.ex:199
+#: lib/graphql/resolvers/resource.ex:174
+#: lib/graphql/resolvers/resource.ex:201
 #, elixir-autogen, elixir-format
 msgid "Resource doesn't exist"
 msgstr ""
@@ -515,7 +509,7 @@ msgstr ""
 msgid "The event has already reached its maximum capacity"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:282
+#: lib/graphql/resolvers/participant.ex:289
 #, elixir-autogen, elixir-format
 msgid "This token is invalid"
 msgstr ""
@@ -549,7 +543,7 @@ msgstr ""
 msgid "User not found"
 msgstr ""
 
-#: lib/graphql/resolvers/person.ex:333
+#: lib/graphql/resolvers/person.ex:335
 #, elixir-autogen, elixir-format
 msgid "You already have a profile for this user"
 msgstr ""
@@ -571,7 +565,7 @@ msgstr ""
 msgid "You are not a moderator or admin for this group"
 msgstr ""
 
-#: lib/graphql/resolvers/comment.ex:80
+#: lib/graphql/resolvers/comment.ex:74
 #, elixir-autogen, elixir-format
 msgid "You are not allowed to create a comment if not connected"
 msgstr ""
@@ -581,7 +575,7 @@ msgstr ""
 msgid "You are not allowed to create a feed token if not connected"
 msgstr ""
 
-#: lib/graphql/resolvers/comment.ex:155
+#: lib/graphql/resolvers/comment.ex:161
 #, elixir-autogen, elixir-format
 msgid "You are not allowed to delete a comment if not connected"
 msgstr ""
@@ -591,7 +585,7 @@ msgstr ""
 msgid "You are not allowed to delete a feed token if not connected"
 msgstr ""
 
-#: lib/graphql/resolvers/comment.ex:114
+#: lib/graphql/resolvers/comment.ex:120
 #, elixir-autogen, elixir-format
 msgid "You are not allowed to update a comment if not connected"
 msgstr ""
@@ -607,12 +601,12 @@ msgstr ""
 msgid "You can't set yourself to a lower member role for this group because you are the only administrator"
 msgstr ""
 
-#: lib/graphql/resolvers/comment.ex:143
+#: lib/graphql/resolvers/comment.ex:149
 #, elixir-autogen, elixir-format
 msgid "You cannot delete this comment"
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:403
+#: lib/graphql/resolvers/event.ex:430
 #, elixir-autogen, elixir-format
 msgid "You cannot delete this event"
 msgstr ""
@@ -647,17 +641,17 @@ msgstr ""
 msgid "You need to be logged-in and a moderator to view a report"
 msgstr ""
 
-#: lib/graphql/resolvers/admin.ex:252
+#: lib/graphql/resolvers/admin.ex:258
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in and an administrator to access admin settings"
 msgstr ""
 
-#: lib/graphql/resolvers/admin.ex:236
+#: lib/graphql/resolvers/admin.ex:242
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in and an administrator to access dashboard statistics"
 msgstr ""
 
-#: lib/graphql/resolvers/admin.ex:278
+#: lib/graphql/resolvers/admin.ex:283
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in and an administrator to save admin settings"
 msgstr ""
@@ -667,12 +661,12 @@ msgstr ""
 msgid "You need to be logged-in to access discussions"
 msgstr ""
 
-#: lib/graphql/resolvers/resource.ex:96
+#: lib/graphql/resolvers/resource.ex:98
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to access resources"
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:313
+#: lib/graphql/resolvers/event.ex:321
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to create events"
 msgstr ""
@@ -687,12 +681,12 @@ msgstr ""
 msgid "You need to be logged-in to create reports"
 msgstr ""
 
-#: lib/graphql/resolvers/resource.ex:140
+#: lib/graphql/resolvers/resource.ex:142
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to create resources"
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:412
+#: lib/graphql/resolvers/event.ex:439
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to delete an event"
 msgstr ""
@@ -702,7 +696,7 @@ msgstr ""
 msgid "You need to be logged-in to delete posts"
 msgstr ""
 
-#: lib/graphql/resolvers/resource.ex:207
+#: lib/graphql/resolvers/resource.ex:209
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to delete resources"
 msgstr ""
@@ -717,7 +711,7 @@ msgstr ""
 msgid "You need to be logged-in to leave an event"
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:369
+#: lib/graphql/resolvers/event.ex:396
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to update an event"
 msgstr ""
@@ -727,17 +721,17 @@ msgstr ""
 msgid "You need to be logged-in to update posts"
 msgstr ""
 
-#: lib/graphql/resolvers/resource.ex:177
+#: lib/graphql/resolvers/resource.ex:179
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to update resources"
 msgstr ""
 
-#: lib/graphql/resolvers/resource.ex:236
+#: lib/graphql/resolvers/resource.ex:233
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to view a resource preview"
 msgstr ""
 
-#: lib/graphql/resolvers/resource.ex:132
+#: lib/graphql/resolvers/resource.ex:134
 #, elixir-autogen, elixir-format
 msgid "Parent resource doesn't belong to this group"
 msgstr ""
@@ -823,12 +817,12 @@ msgstr ""
 msgid "Profile is not administrator for the group"
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:358
+#: lib/graphql/resolvers/event.ex:385
 #, elixir-autogen, elixir-format
 msgid "You can't edit this event."
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:361
+#: lib/graphql/resolvers/event.ex:388
 #, elixir-autogen, elixir-format
 msgid "You can't attribute this event to this profile."
 msgstr ""
@@ -848,7 +842,7 @@ msgstr ""
 msgid "You don't have the right to remove this member."
 msgstr ""
 
-#: lib/mobilizon/actors/actor.ex:377
+#: lib/mobilizon/actors/actor.ex:378
 #, elixir-autogen, elixir-format
 msgid "This username is already taken."
 msgstr ""
@@ -858,7 +852,7 @@ msgstr ""
 msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:275
+#: lib/graphql/resolvers/event.ex:276
 #, elixir-autogen, elixir-format
 msgid "Organizer profile is not owned by the user"
 msgstr ""
@@ -870,41 +864,41 @@ msgstr ""
 
 #: lib/graphql/resolvers/group.ex:181
 #: lib/graphql/resolvers/group.ex:223
-#: lib/graphql/resolvers/person.ex:157
-#: lib/graphql/resolvers/person.ex:191
-#: lib/graphql/resolvers/person.ex:324
+#: lib/graphql/resolvers/person.ex:159
+#: lib/graphql/resolvers/person.ex:193
+#: lib/graphql/resolvers/person.ex:326
 #, elixir-autogen, elixir-format
 msgid "The provided picture is too heavy"
 msgstr ""
 
-#: lib/graphql/resolvers/resource.ex:129
+#: lib/graphql/resolvers/resource.ex:131
 #, elixir-autogen, elixir-format
 msgid "Error while creating resource"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:537
+#: lib/graphql/resolvers/user.ex:564
 #, elixir-autogen, elixir-format
 msgid "Invalid activation token"
 msgstr ""
 
-#: lib/graphql/resolvers/resource.ex:226
+#: lib/graphql/resolvers/resource.ex:228
 #, elixir-autogen, elixir-format
 msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #: lib/graphql/resolvers/event.ex:165
 #: lib/graphql/resolvers/participant.ex:253
-#: lib/graphql/resolvers/participant.ex:328
+#: lib/graphql/resolvers/participant.ex:335
 #, elixir-autogen, elixir-format
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:286
+#: lib/graphql/resolvers/event.ex:294
 #, elixir-autogen, elixir-format
 msgid "Organizer profile doesn't have permission to create an event on behalf of this group"
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:349
+#: lib/graphql/resolvers/event.ex:369
 #, elixir-autogen, elixir-format
 msgid "This profile doesn't have permission to update an event on behalf of this group"
 msgstr ""
@@ -914,7 +908,7 @@ msgstr ""
 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider"
 msgstr ""
 
-#: lib/graphql/resolvers/comment.ex:150
+#: lib/graphql/resolvers/comment.ex:156
 #, elixir-autogen, elixir-format
 msgid "Comment not found"
 msgstr ""
@@ -924,12 +918,12 @@ msgstr ""
 msgid "Error while creating a discussion"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:658
+#: lib/graphql/resolvers/user.ex:685
 #, elixir-autogen, elixir-format
 msgid "Error while updating locale"
 msgstr ""
 
-#: lib/graphql/resolvers/person.ex:327
+#: lib/graphql/resolvers/person.ex:329
 #, elixir-autogen, elixir-format
 msgid "Error while uploading pictures"
 msgstr ""
@@ -944,13 +938,13 @@ msgstr ""
 msgid "Failed to update the group"
 msgstr ""
 
-#: lib/graphql/resolvers/admin.ex:333
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/admin.ex:357
+#: lib/graphql/resolvers/user.ex:545
 #, elixir-autogen, elixir-format
 msgid "Failed to update user email"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:533
+#: lib/graphql/resolvers/user.ex:560
 #, elixir-autogen, elixir-format
 msgid "Failed to validate user email"
 msgstr ""
@@ -960,37 +954,37 @@ msgstr ""
 msgid "The anonymous actor ID is invalid"
 msgstr ""
 
-#: lib/graphql/resolvers/resource.ex:165
+#: lib/graphql/resolvers/resource.ex:167
 #, elixir-autogen, elixir-format
 msgid "Unknown error while updating resource"
 msgstr ""
 
-#: lib/graphql/resolvers/comment.ex:105
+#: lib/graphql/resolvers/comment.ex:111
 #, elixir-autogen, elixir-format
 msgid "You are not the comment creator"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:458
+#: lib/graphql/resolvers/user.ex:469
 #, elixir-autogen, elixir-format
 msgid "You cannot change your password."
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:321
+#: lib/graphql/resolvers/participant.ex:328
 #, elixir-autogen, elixir-format
 msgid "Format not supported"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:305
+#: lib/graphql/resolvers/participant.ex:312
 #, elixir-autogen, elixir-format
 msgid "A dependency needed to export to %{format} is not installed"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:313
+#: lib/graphql/resolvers/participant.ex:320
 #, elixir-autogen, elixir-format
 msgid "An error occured while saving export"
 msgstr ""
 
-#: lib/web/controllers/export_controller.ex:30
+#: lib/web/controllers/export_controller.ex:32
 #, elixir-autogen, elixir-format
 msgid "Export to format %{format} is not enabled on this instance"
 msgstr ""
@@ -1000,17 +994,17 @@ msgstr ""
 msgid "Only admins can create groups"
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:279
+#: lib/graphql/resolvers/event.ex:280
 #, elixir-autogen, elixir-format
 msgid "Only groups can create events"
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:305
+#: lib/graphql/resolvers/event.ex:313
 #, elixir-autogen, elixir-format
 msgid "Unknown error while creating event"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:514
+#: lib/graphql/resolvers/user.ex:496
 #, elixir-autogen, elixir-format
 msgid "User cannot change email"
 msgstr ""
@@ -1025,12 +1019,12 @@ msgstr ""
 msgid "Follow not found"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:379
+#: lib/graphql/resolvers/user.ex:390
 #, elixir-autogen, elixir-format
 msgid "Profile with username %{username} not found"
 msgstr ""
 
-#: lib/graphql/resolvers/user.ex:374
+#: lib/graphql/resolvers/user.ex:385
 #, elixir-autogen, elixir-format
 msgid "This profile does not belong to you"
 msgstr ""
@@ -1075,22 +1069,22 @@ msgstr ""
 msgid "Your email seems to be using an invalid format"
 msgstr ""
 
-#: lib/graphql/resolvers/admin.ex:382
+#: lib/graphql/resolvers/admin.ex:399
 #, elixir-autogen, elixir-format
 msgid "Can't confirm an already confirmed user"
 msgstr ""
 
-#: lib/graphql/resolvers/admin.ex:386
+#: lib/graphql/resolvers/admin.ex:403
 #, elixir-autogen, elixir-format
 msgid "Deconfirming users is not supported"
 msgstr ""
 
-#: lib/graphql/resolvers/admin.ex:358
+#: lib/graphql/resolvers/admin.ex:375
 #, elixir-autogen, elixir-format
 msgid "The new role must be different"
 msgstr ""
 
-#: lib/graphql/resolvers/admin.ex:309
+#: lib/graphql/resolvers/admin.ex:314
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in and an administrator to edit an user's details"
 msgstr ""
@@ -1100,28 +1094,28 @@ msgstr ""
 msgid "A profile or group with that name already exists"
 msgstr ""
 
-#: lib/graphql/resolvers/admin.ex:519
+#: lib/graphql/resolvers/admin.ex:542
 #, elixir-autogen, elixir-format
 msgid "Unable to find an instance to follow at this address"
 msgstr ""
 
-#: lib/mobilizon/actors/actor.ex:396
+#: lib/mobilizon/actors/actor.ex:397
 #, elixir-autogen, elixir-format
 msgid "Username must only contain alphanumeric lowercased characters and underscores."
 msgstr ""
 
 #: lib/graphql/resolvers/user.ex:303
-#: lib/graphql/resolvers/user.ex:326
+#: lib/graphql/resolvers/user.ex:333
 #, elixir-autogen, elixir-format
 msgid "This email doesn't seem to be valid"
 msgstr ""
 
-#: lib/graphql/resolvers/comment.ex:65
+#: lib/graphql/resolvers/comment.ex:59
 #, elixir-autogen, elixir-format
 msgid "This comment was detected as spam."
 msgstr ""
 
-#: lib/graphql/resolvers/event.ex:293
+#: lib/graphql/resolvers/event.ex:301
 #, elixir-autogen, elixir-format
 msgid "This event was detected as spam."
 msgstr ""
@@ -1142,7 +1136,7 @@ msgstr ""
 msgid "You need to be a moderator or an administrator to create a note on a report"
 msgstr ""
 
-#: lib/graphql/resolvers/person.ex:330
+#: lib/graphql/resolvers/person.ex:332
 #, elixir-autogen, elixir-format
 msgid "Your profile was detected as spam."
 msgstr ""
@@ -1152,7 +1146,7 @@ msgstr ""
 msgid "Your registration has been detected as spam and cannot be processed."
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:86
+#: lib/web/controllers/application_controller.ex:88
 #, elixir-autogen, elixir-format
 msgid "All of name, scope and redirect_uri parameters are required to create an application"
 msgstr ""
@@ -1167,171 +1161,222 @@ msgstr ""
 msgid "Application token not found"
 msgstr ""
 
-#: lib/graphql/resolvers/application.ex:89
+#: lib/graphql/resolvers/application.ex:90
 #, elixir-autogen, elixir-format
 msgid "Error while revoking token"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:59
+#: lib/web/controllers/application_controller.ex:61
 #, elixir-autogen, elixir-format
 msgid "Impossible to create application."
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:356
+#: lib/web/controllers/application_controller.ex:358
 #, elixir-autogen, elixir-format
 msgid "Incorrect parameters sent. You need to provide at least the grant_type and client_id parameters, depending on the grant type being used."
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:329
+#: lib/web/controllers/application_controller.ex:331
 #, elixir-autogen, elixir-format
 msgid "Invalid client credentials provided"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:337
+#: lib/web/controllers/application_controller.ex:339
 #, elixir-autogen, elixir-format
 msgid "Invalid refresh token provided"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:170
-#: lib/web/controllers/application_controller.ex:401
+#: lib/web/controllers/application_controller.ex:172
+#: lib/web/controllers/application_controller.ex:403
 #, elixir-autogen, elixir-format
 msgid "No application was found with this client_id"
 msgstr ""
 
-#: lib/graphql/resolvers/application.ex:37
+#: lib/graphql/resolvers/application.ex:38
 #, elixir-autogen, elixir-format
 msgid "No application with this client_id was found"
 msgstr ""
 
-#: lib/graphql/authorization.ex:80
+#: lib/graphql/authorization.ex:81
 #, elixir-autogen, elixir-format
 msgid "Not authorized to access field %{field}"
 msgstr ""
 
-#: lib/graphql/authorization.ex:70
-#: lib/graphql/authorization.ex:75
+#: lib/graphql/authorization.ex:71
+#: lib/graphql/authorization.ex:76
 #, elixir-autogen, elixir-format
 msgid "Not authorized to access object %{object}"
 msgstr ""
 
-#: lib/graphql/authorization.ex:63
+#: lib/graphql/authorization.ex:64
 #, elixir-autogen, elixir-format
 msgid "Not authorized to access this %{object_type}"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:279
+#: lib/web/controllers/application_controller.ex:281
 #, elixir-autogen, elixir-format
 msgid "Please slow down the rate of your requests"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:267
+#: lib/web/controllers/application_controller.ex:269
 #, elixir-autogen, elixir-format
 msgid "The authorization request is still pending"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:249
+#: lib/web/controllers/application_controller.ex:251
 #, elixir-autogen, elixir-format
 msgid "The client_id provided or the device_code associated is invalid"
 msgstr ""
 
-#: lib/graphql/resolvers/application.ex:133
+#: lib/graphql/resolvers/application.ex:139
 #, elixir-autogen, elixir-format
 msgid "The device user code was not provided before approving the application"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:304
+#: lib/web/controllers/application_controller.ex:306
 #, elixir-autogen, elixir-format
 msgid "The given device_code has expired"
 msgstr ""
 
-#: lib/graphql/resolvers/application.ex:44
+#: lib/graphql/resolvers/application.ex:45
 #, elixir-autogen, elixir-format
 msgid "The given redirect_uri is not in the list of allowed redirect URIs"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:158
+#: lib/web/controllers/application_controller.ex:160
 #, elixir-autogen, elixir-format
 msgid "The given scope is not in the list of the app declared scopes"
 msgstr ""
 
-#: lib/graphql/resolvers/application.ex:109
-#: lib/graphql/resolvers/application.ex:146
+#: lib/graphql/resolvers/application.ex:112
+#: lib/graphql/resolvers/application.ex:154
 #, elixir-autogen, elixir-format
 msgid "The given user code has expired"
 msgstr ""
 
-#: lib/graphql/resolvers/application.ex:112
-#: lib/graphql/resolvers/application.ex:140
+#: lib/graphql/resolvers/application.ex:118
+#: lib/graphql/resolvers/application.ex:146
 #, elixir-autogen, elixir-format
 msgid "The given user code is invalid"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:411
+#: lib/web/controllers/application_controller.ex:413
 #, elixir-autogen, elixir-format
 msgid "The provided client_id does not match the provided code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:414
+#: lib/web/controllers/application_controller.ex:416
 #, elixir-autogen, elixir-format
 msgid "The provided client_secret is invalid"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:407
+#: lib/web/controllers/application_controller.ex:409
 #, elixir-autogen, elixir-format
 msgid "The provided code is invalid or expired"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:418
+#: lib/web/controllers/application_controller.ex:420
 #, elixir-autogen, elixir-format
 msgid "The provided scope is invalid or not included in the app declared scopes"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:45
+#: lib/web/controllers/application_controller.ex:47
 #, elixir-autogen, elixir-format
 msgid "The scope parameter is not a space separated list of valid scopes"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:292
+#: lib/web/controllers/application_controller.ex:294
 #, elixir-autogen, elixir-format
 msgid "The user rejected the requested authorization"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:404
+#: lib/web/controllers/application_controller.ex:406
 #, elixir-autogen, elixir-format
 msgid "This redirect URI is not allowed"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:381
+#: lib/web/controllers/application_controller.ex:383
 #, elixir-autogen, elixir-format
 msgid "Token not found"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:72
+#: lib/web/controllers/application_controller.ex:74
 #, elixir-autogen, elixir-format
 msgid "Too many requests"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:184
+#: lib/web/controllers/application_controller.ex:186
 #, elixir-autogen, elixir-format
 msgid "Unable to produce device code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:373
+#: lib/web/controllers/application_controller.ex:375
 #, elixir-autogen, elixir-format
 msgid "Unable to revoke token"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:198
+#: lib/web/controllers/application_controller.ex:200
 #, elixir-autogen, elixir-format
 msgid "You need to pass both client_id and scope as parameters to obtain a device code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:136
+#: lib/web/controllers/application_controller.ex:138
 #, elixir-autogen, elixir-format
 msgid "You need to provide a valid redirect_uri to autorize an application"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:126
+#: lib/web/controllers/application_controller.ex:128
 #, elixir-autogen, elixir-format
 msgid "You need to specify client_id, redirect_uri, scope and state to autorize an application"
 msgstr ""
+
+#: lib/graphql/resolvers/user.ex:306
+#, elixir-autogen, elixir-format
+msgid "Couldn't send an email. Internal error."
+msgstr ""
+
+#: lib/graphql/resolvers/participant.ex:286
+#, elixir-autogen, elixir-format
+msgid "Participation is already confirmed"
+msgstr ""
+
+#: lib/graphql/resolvers/participant.ex:283
+#, elixir-autogen, elixir-format
+msgid "Participation is confirmed but not approved yet by an organizer"
+msgstr ""
+
+#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:376
+#, elixir-autogen, elixir-format
+msgid "Providing external registration is not allowed"
+msgstr ""
+
+#: lib/graphql/resolvers/push_subscription.ex:48
+#, elixir-autogen, elixir-format
+msgid "The same push subscription has already been registered"
+msgstr ""
+
+#: lib/graphql/resolvers/admin.ex:536
+#, elixir-autogen, elixir-format
+msgid "This instance is pending follow approval"
+msgstr ""
+
+#: lib/graphql/schema/custom/timezone.ex:23
+#, elixir-autogen, elixir-format
+msgid "Timezone ID %{timezone} is invalid"
+msgstr ""
+
+#: lib/graphql/resolvers/admin.ex:539
+#, elixir-autogen, elixir-format
+msgid "You are already following this instance"
+msgstr ""
+
+#: lib/graphql/resolvers/user.ex:310
+#, elixir-autogen, elixir-format
+msgid "You requested again a confirmation email too soon. Please try again in a few minutes"
+msgstr ""
+
+#: lib/graphql/resolvers/user.ex:341
+#, elixir-autogen, elixir-format
+msgid "You requested again a password reset email too soon. Please try again in a few minutes"
+msgstr ""
diff --git a/test/graphql/resolvers/user_test.exs b/test/graphql/resolvers/user_test.exs
index e3e1822ae..0267bd553 100644
--- a/test/graphql/resolvers/user_test.exs
+++ b/test/graphql/resolvers/user_test.exs
@@ -874,7 +874,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
         |> post("/api", AbsintheHelpers.mutation_skeleton(mutation))
 
       assert hd(json_response(res, 200)["errors"])["message"] ==
-               "The password you have choosen is too short. Please make sure your password contains at least 6 charaters."
+               "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
     end
 
     test "test reset_password/3 with an invalid token", context do