diff --git a/snikket_web/translations/messages.pot b/snikket_web/translations/messages.pot
index 5843b46..493dfe9 100644
--- a/snikket_web/translations/messages.pot
+++ b/snikket_web/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-30 12:45+0100\n"
+"POT-Creation-Date: 2021-02-23 07:55+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,194 +21,260 @@ msgstr ""
 msgid "Delete user permanently"
 msgstr ""
 
-#: snikket_web/admin.py:129
+#: snikket_web/admin.py:73
+msgid "User deleted"
+msgstr ""
+
+#: snikket_web/admin.py:116
+msgid "Password reset link created"
+msgstr ""
+
+#: snikket_web/admin.py:122
+msgid "Password reset link deleted"
+msgstr ""
+
+#: snikket_web/admin.py:141
 msgid "Invite to circle"
 msgstr ""
 
-#: snikket_web/admin.py:135
+#: snikket_web/admin.py:147
 msgid "At least one circle must be selected"
 msgstr ""
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:152
 msgid "Valid for"
 msgstr ""
 
-#: snikket_web/admin.py:142
+#: snikket_web/admin.py:154
 msgid "One hour"
 msgstr ""
 
-#: snikket_web/admin.py:143
+#: snikket_web/admin.py:155
 msgid "Twelve hours"
 msgstr ""
 
-#: snikket_web/admin.py:144
+#: snikket_web/admin.py:156
 msgid "One day"
 msgstr ""
 
-#: snikket_web/admin.py:145
+#: snikket_web/admin.py:157
 msgid "One week"
 msgstr ""
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:158
 msgid "Four weeks"
 msgstr ""
 
-#: snikket_web/admin.py:152 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:164 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr ""
 
-#: snikket_web/admin.py:154 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:166 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr ""
 
-#: snikket_web/admin.py:155 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:167 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr ""
 
-#: snikket_web/admin.py:161
+#: snikket_web/admin.py:173
 msgid "New invitation link"
 msgstr ""
 
-#: snikket_web/admin.py:223
+#: snikket_web/admin.py:235
 msgid "Revoke"
 msgstr ""
 
-#: snikket_web/admin.py:283 snikket_web/admin.py:327
+#: snikket_web/admin.py:259
+msgid "Invitation created"
+msgstr ""
+
+#: snikket_web/admin.py:275
+msgid "No such invitation exists"
+msgstr ""
+
+#: snikket_web/admin.py:290
+msgid "Invitation revoked"
+msgstr ""
+
+#: snikket_web/admin.py:307 snikket_web/admin.py:355
 msgid "Name"
 msgstr ""
 
-#: snikket_web/admin.py:288 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:312 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr ""
 
-#: snikket_web/admin.py:332
+#: snikket_web/admin.py:342
+msgid "Circle created"
+msgstr ""
+
+#: snikket_web/admin.py:360
 msgid "Select user"
 msgstr ""
 
-#: snikket_web/admin.py:337
+#: snikket_web/admin.py:365
 msgid "Update circle"
 msgstr ""
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:369
 msgid "Delete circle permanently"
 msgstr ""
 
-#: snikket_web/admin.py:347
+#: snikket_web/admin.py:375
 msgid "Add user"
 msgstr ""
 
+#: snikket_web/admin.py:391
+msgid "No such circle exists"
+msgstr ""
+
+#: snikket_web/admin.py:428
+msgid "Circle data updated"
+msgstr ""
+
+#: snikket_web/admin.py:434
+msgid "Circle deleted"
+msgstr ""
+
+#: snikket_web/admin.py:445
+msgid "User added to circle"
+msgstr ""
+
+#: snikket_web/admin.py:454
+msgid "User removed from circle"
+msgstr ""
+
 #: snikket_web/infra.py:40
 msgid "Main"
 msgstr ""
 
-#: snikket_web/invite.py:93
+#: snikket_web/invite.py:104
 msgid "Username"
 msgstr ""
 
-#: snikket_web/invite.py:97 snikket_web/invite.py:164 snikket_web/main.py:41
+#: snikket_web/invite.py:108 snikket_web/invite.py:175 snikket_web/main.py:42
 msgid "Password"
 msgstr ""
 
-#: snikket_web/invite.py:101 snikket_web/invite.py:168
+#: snikket_web/invite.py:112 snikket_web/invite.py:179
 msgid "Confirm password"
 msgstr ""
 
-#: snikket_web/invite.py:105 snikket_web/invite.py:172
+#: snikket_web/invite.py:116 snikket_web/invite.py:183
 msgid "The passwords must match"
 msgstr ""
 
-#: snikket_web/invite.py:110
+#: snikket_web/invite.py:121
 msgid "Create account"
 msgstr ""
 
-#: snikket_web/invite.py:137
+#: snikket_web/invite.py:148
 msgid "That username is already taken"
 msgstr ""
 
-#: snikket_web/invite.py:141 snikket_web/invite.py:205
+#: snikket_web/invite.py:152 snikket_web/invite.py:216
 msgid "Registration was declined for unknown reasons"
 msgstr ""
 
-#: snikket_web/invite.py:145
+#: snikket_web/invite.py:156
 msgid "The username is not valid"
 msgstr ""
 
-#: snikket_web/invite.py:177 snikket_web/templates/user_home.html:32
-#: snikket_web/templates/user_passwd.html:32
+#: snikket_web/invite.py:188 snikket_web/templates/user_home.html:32
+#: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr ""
 
-#: snikket_web/main.py:36
+#: snikket_web/main.py:37
 msgid "Address"
 msgstr ""
 
-#: snikket_web/main.py:46
+#: snikket_web/main.py:47
 msgid "Sign in"
 msgstr ""
 
-#: snikket_web/main.py:72
+#: snikket_web/main.py:56
 msgid "Invalid username or password."
 msgstr ""
 
-#: snikket_web/user.py:21
+#: snikket_web/main.py:84
+msgid "Login successful!"
+msgstr ""
+
+#: snikket_web/user.py:28
 msgid "Current password"
 msgstr ""
 
-#: snikket_web/user.py:26
+#: snikket_web/user.py:33
 msgid "New password"
 msgstr ""
 
-#: snikket_web/user.py:31
+#: snikket_web/user.py:38
 msgid "Confirm new password"
 msgstr ""
 
-#: snikket_web/user.py:35
+#: snikket_web/user.py:42
 msgid "The new passwords must match"
 msgstr ""
 
-#: snikket_web/user.py:42
+#: snikket_web/user.py:49
 msgid "Sign out"
 msgstr ""
 
-#: snikket_web/user.py:47
+#: snikket_web/user.py:54
 msgid "Nobody"
 msgstr ""
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:55
 msgid "Friends only"
 msgstr ""
 
-#: snikket_web/user.py:49
+#: snikket_web/user.py:56
 msgid "Everyone"
 msgstr ""
 
 #: snikket_web/templates/admin_delete_user.html:12
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:55
+#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:62
 msgid "Display name"
 msgstr ""
 
-#: snikket_web/user.py:59
+#: snikket_web/user.py:66
 msgid "Avatar"
 msgstr ""
 
-#: snikket_web/user.py:63
+#: snikket_web/user.py:70
 msgid "Profile visibility"
 msgstr ""
 
-#: snikket_web/user.py:68
+#: snikket_web/user.py:75
 msgid "Update profile"
 msgstr ""
 
-#: snikket_web/user.py:93
+#: snikket_web/user.py:100
 msgid "Incorrect password"
 msgstr ""
 
-#: snikket_web/templates/_footer.html:4 snikket_web/templates/login.html:36
+#: snikket_web/user.py:104
+msgid "Password changed"
+msgstr ""
+
+#: snikket_web/user.py:146
+msgid "Profile updated"
+msgstr ""
+
+#: snikket_web/templates/_footer.html:4
 #, python-format
 msgid "A <a href=\"%(about_url)s\">Snikket</a> service"
 msgstr ""
 
-#: snikket_web/templates/about.html:9
+#: snikket_web/templates/_footer.html:6
+msgid ""
+"“Snikket” and the parrot logo are trademarks of Snikket Community "
+"Interest Company."
+msgstr ""
+
+#: snikket_web/templates/about.html:4 snikket_web/templates/about.html:9
 msgid "About Snikket"
 msgstr ""
 
@@ -257,10 +323,22 @@ msgid ""
 msgstr ""
 
 #: snikket_web/templates/about.html:17
+msgid "Trademarks"
+msgstr ""
+
+#: snikket_web/templates/about.html:18
+#, python-format
+msgid ""
+"“Snikket” and the parrot logo are trademarks of Snikket Community "
+"Interest Company. For more information about the trademarks, visit the <a"
+" href=\"%(trademarks_url)s\">Snikket Trademarks information page</a>."
+msgstr ""
+
+#: snikket_web/templates/about.html:19
 msgid "Software Versions"
 msgstr ""
 
-#: snikket_web/templates/about.html:27
+#: snikket_web/templates/about.html:29
 msgid "Back to the main page"
 msgstr ""
 
@@ -350,7 +428,7 @@ msgid "Debug information for %(user_name)s"
 msgstr ""
 
 #: snikket_web/templates/admin_debug_user.html:11
-#: snikket_web/templates/user_passwd.html:26
+#: snikket_web/templates/user_passwd.html:23
 msgid "Warning"
 msgstr ""
 
@@ -400,9 +478,9 @@ msgstr ""
 #: snikket_web/templates/admin_edit_circle.html:44
 #: snikket_web/templates/admin_edit_invite.html:49
 #: snikket_web/templates/admin_reset_user_password.html:25
-#: snikket_web/templates/user_logout.html:13
-#: snikket_web/templates/user_passwd.html:30
-#: snikket_web/templates/user_profile.html:31
+#: snikket_web/templates/user_logout.html:10
+#: snikket_web/templates/user_passwd.html:27
+#: snikket_web/templates/user_profile.html:28
 msgid "Back"
 msgstr ""
 
@@ -476,7 +554,6 @@ msgid "View invitation"
 msgstr ""
 
 #: snikket_web/templates/admin_edit_invite.html:13
-#: snikket_web/templates/admin_invites.html:21
 #: snikket_web/templates/admin_reset_user_password.html:15
 msgid "Valid until"
 msgstr ""
@@ -568,6 +645,10 @@ msgstr ""
 msgid "Pending invitations"
 msgstr ""
 
+#: snikket_web/templates/admin_invites.html:21
+msgid "Expires"
+msgstr ""
+
 #: snikket_web/templates/admin_invites.html:22
 msgid "Type"
 msgstr ""
@@ -649,7 +730,7 @@ msgid "The web portal encountered an internal error."
 msgstr ""
 
 #: snikket_web/templates/invite_invalid.html:5
-#: snikket_web/templates/invite_view.html:12
+#: snikket_web/templates/invite_view.html:13
 #, python-format
 msgid "Invite to %(site_name)s"
 msgstr ""
@@ -657,7 +738,7 @@ msgstr ""
 #: snikket_web/templates/invite_invalid.html:6
 #: snikket_web/templates/invite_register.html:10
 #: snikket_web/templates/invite_success.html:11
-#: snikket_web/templates/invite_view.html:13
+#: snikket_web/templates/invite_view.html:14
 #, python-format
 msgid "Powered by <img src=\"%(logo_url)s\" alt=\"Snikket\">"
 msgstr ""
@@ -698,18 +779,18 @@ msgid ""
 msgstr ""
 
 #: snikket_web/templates/invite_register.html:14
-#: snikket_web/templates/invite_view.html:37
+#: snikket_web/templates/invite_view.html:38
 msgid "App already installed?"
 msgstr ""
 
 #: snikket_web/templates/invite_register.html:16
 #: snikket_web/templates/invite_reset_view.html:21
-#: snikket_web/templates/invite_view.html:39
+#: snikket_web/templates/invite_view.html:40
 msgid "Open the app"
 msgstr ""
 
 #: snikket_web/templates/invite_register.html:18
-#: snikket_web/templates/invite_view.html:41
+#: snikket_web/templates/invite_view.html:42
 msgid "This button works only if you have the app installed already!"
 msgstr ""
 
@@ -795,7 +876,7 @@ msgid ""
 msgstr ""
 
 #: snikket_web/templates/invite_reset_view.html:26
-#: snikket_web/templates/invite_view.html:75
+#: snikket_web/templates/invite_view.html:76
 msgid ""
 "Your camera will turn on. Point it at the square code below until it is "
 "within the highlighted square on your screen, and wait until the app "
@@ -807,7 +888,7 @@ msgid "You will then be prompted to enter a new password for your account."
 msgstr ""
 
 #: snikket_web/templates/invite_reset_view.html:29
-#: snikket_web/templates/invite_view.html:43
+#: snikket_web/templates/invite_view.html:44
 msgid "Alternatives"
 msgstr ""
 
@@ -848,29 +929,29 @@ msgstr ""
 msgid "Invite to %(site_name)s | Snikket"
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:15
+#: snikket_web/templates/invite_view.html:16
 #, python-format
 msgid ""
 "You have been invited to chat with %(inviter_name)s using Snikket, a "
 "secure, privacy-friendly chat app on %(site_name)s."
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:17
+#: snikket_web/templates/invite_view.html:18
 #, python-format
 msgid ""
 "You have been invited to chat on %(site_name)s using Snikket, a secure, "
 "privacy-friendly chat app."
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:19
+#: snikket_web/templates/invite_view.html:20
 msgid "Get started"
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:21
+#: snikket_web/templates/invite_view.html:22
 msgid "Install the Snikket App on your Android or iOS device."
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:23
+#: snikket_web/templates/invite_view.html:24
 #, python-format
 msgid ""
 "Install the Snikket App on your Android device (<a "
@@ -878,25 +959,25 @@ msgid ""
 "target=\"_blank\">iOS coming soon!</a>)."
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:27
+#: snikket_web/templates/invite_view.html:28
 msgid "Get it on Google Play"
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:29
+#: snikket_web/templates/invite_view.html:30
 msgid "Download on the App Store"
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:33
-msgid "Not on mobile?"
+#: snikket_web/templates/invite_view.html:34
+msgid "Send to mobile device"
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:36
+#: snikket_web/templates/invite_view.html:37
 msgid ""
 "After installation the app should automatically open and prompt you to "
 "create an account. If not, simply click the button below."
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:44
+#: snikket_web/templates/invite_view.html:45
 #, python-format
 msgid ""
 "You can connect to Snikket using any XMPP-compatible software. If the "
@@ -904,37 +985,37 @@ msgid ""
 "href=\"%(register_url)s\">register an account manually</a>."
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:50
+#: snikket_web/templates/invite_view.html:51
 msgid "Scan invite code"
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:53
-#: snikket_web/templates/invite_view.html:82
+#: snikket_web/templates/invite_view.html:54
+#: snikket_web/templates/invite_view.html:83
 msgid "Close"
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:56
+#: snikket_web/templates/invite_view.html:57
 msgid ""
 "You can transfer this invite to your mobile device by scanning a code "
 "with your camera. You can use either a QR scanner app or the Snikket app "
 "itself."
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:61
+#: snikket_web/templates/invite_view.html:62
 msgid "Using a QR code scanner"
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:63
+#: snikket_web/templates/invite_view.html:64
 msgid "Using the Snikket app"
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:68
+#: snikket_web/templates/invite_view.html:69
 msgid ""
 "Use a <em>QR code</em> scanner on your mobile device to scan the code "
 "below:"
 msgstr ""
 
-#: snikket_web/templates/invite_view.html:74
+#: snikket_web/templates/invite_view.html:75
 msgid ""
 "Install the Snikket app on your mobile device, open it, and tap the "
 "'Scan' button at the top."
@@ -972,6 +1053,25 @@ msgstr ""
 msgid "Login failed"
 msgstr ""
 
+#: snikket_web/templates/login.html:23
+msgid "Incorrect address"
+msgstr ""
+
+#: snikket_web/templates/login.html:24
+#, python-format
+msgid ""
+"This Snikket service only hosts addresses ending in "
+"<em>@%(snikket_domain)s</em>. Your password was not sent."
+msgstr ""
+
+#: snikket_web/templates/unauth.html:16
+msgid "Operation successful"
+msgstr ""
+
+#: snikket_web/templates/unauth.html:18
+msgid "Error"
+msgstr ""
+
 #: snikket_web/templates/user_home.html:9
 msgid "Welcome!"
 msgstr ""
@@ -1005,46 +1105,46 @@ msgstr ""
 msgid "Admin panel"
 msgstr ""
 
-#: snikket_web/templates/user_logout.html:8
+#: snikket_web/templates/user_logout.html:5
 msgid "Sign out of the Snikket Web Portal"
 msgstr ""
 
-#: snikket_web/templates/user_logout.html:9
+#: snikket_web/templates/user_logout.html:6
 msgid ""
 "Click below to log yourself out of the web portal. This does not affect "
 "any other connected devices."
 msgstr ""
 
-#: snikket_web/templates/user_passwd.html:8
+#: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr ""
 
-#: snikket_web/templates/user_passwd.html:9
+#: snikket_web/templates/user_passwd.html:6
 msgid ""
 "To change your password, you need to provide the current password as well"
 " as the new one. To reduce the chance of typos, we ask for your new "
 "password twice."
 msgstr ""
 
-#: snikket_web/templates/user_passwd.html:27
+#: snikket_web/templates/user_passwd.html:24
 msgid ""
 "After changing your password, you will have to enter the new password on "
 "all of your devices."
 msgstr ""
 
-#: snikket_web/templates/user_profile.html:7
+#: snikket_web/templates/user_profile.html:4
 msgid "Update your profile"
 msgstr ""
 
-#: snikket_web/templates/user_profile.html:9
+#: snikket_web/templates/user_profile.html:6
 msgid "Profile"
 msgstr ""
 
-#: snikket_web/templates/user_profile.html:22
+#: snikket_web/templates/user_profile.html:19
 msgid "Visibility"
 msgstr ""
 
-#: snikket_web/templates/user_profile.html:23
+#: snikket_web/templates/user_profile.html:20
 msgid ""
 "This section allows you to control who can see your profile information, "
 "like avatar and nickname."