diff --git a/snikket_web/translations/de/LC_MESSAGES/messages.po b/snikket_web/translations/de/LC_MESSAGES/messages.po
index f5f2069..0f176cd 100644
--- a/snikket_web/translations/de/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SnikketWeb 0.1.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-26 15:06+0100\n"
+"POT-Creation-Date: 2021-01-26 16:12+0100\n"
 "PO-Revision-Date: 2021-01-26 14:06+0000\n"
 "Last-Translator: Jonas Schäfer <jonas@zombofant.net>\n"
 "Language-Team: German <https://i18n.sotecware.net/projects/snikket/web-"
@@ -72,7 +72,7 @@ msgstr "Löschen"
 msgid "Name"
 msgstr "Name"
 
-#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:42
+#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:44
 msgid "Create circle"
 msgstr "Gemeinschaft gründen"
 
@@ -80,9 +80,11 @@ msgstr "Gemeinschaft gründen"
 msgid "Select user"
 msgstr "Benutzer auswählen"
 
-#: snikket_web/admin.py:328 snikket_web/user.py:68
-msgid "Apply"
-msgstr "Übernehmen"
+#: snikket_web/admin.py:328
+#, fuzzy
+#| msgid "Create circle"
+msgid "Update circle"
+msgstr "Gemeinschaft gründen"
 
 #: snikket_web/admin.py:332
 msgid "Delete circle permanently"
@@ -192,6 +194,10 @@ msgstr "Bild"
 msgid "Profile visibility"
 msgstr "Profilsichtbarkeit"
 
+#: snikket_web/templates/user_home.html:7 snikket_web/user.py:68
+msgid "Update profile"
+msgstr "Profil bearbeiten"
+
 #: snikket_web/user.py:93
 msgid "Incorrect password"
 msgstr "Ungültiges Passwort"
@@ -277,35 +283,48 @@ msgstr "Administration"
 msgid "Manage circles"
 msgstr "Gemeinschaften verwalten"
 
-#: snikket_web/templates/admin_circles.html:11
+#: snikket_web/templates/admin_circles.html:5
+msgid ""
+"<em>Circles</em> aim to help people who are in the same social circle find "
+"each other on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:6
+msgid ""
+"Users who are in the same circle will see each other in their contact list. "
+"In addition, each circle has a group chat where the circle members are "
+"included."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:13
 msgid "Circle name"
 msgstr "Name"
 
-#: snikket_web/templates/admin_circles.html:12
+#: snikket_web/templates/admin_circles.html:14
 msgid "Members"
 msgstr "Mitglieder"
 
-#: snikket_web/templates/admin_circles.html:13
+#: snikket_web/templates/admin_circles.html:15
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:14
 msgid "Actions"
 msgstr "Aktionen"
 
-#: snikket_web/templates/admin_circles.html:23
+#: snikket_web/templates/admin_circles.html:25
 #, python-format
 msgid "Create invitation to circle %(circle_name)s"
 msgstr "Einladung in die %(circle_name)s Gemeinschaft erzeugen"
 
-#: snikket_web/templates/admin_circles.html:26
+#: snikket_web/templates/admin_circles.html:28
 #, python-format
 msgid "Show details of circle %(circle_name)s"
 msgstr "Details der %(circle_name)s Gemeinschaft anzeigen"
 
-#: snikket_web/templates/admin_circles.html:35
+#: snikket_web/templates/admin_circles.html:37
 msgid "No circles"
 msgstr "Keine Gemeinschaften"
 
-#: snikket_web/templates/admin_circles.html:36
+#: snikket_web/templates/admin_circles.html:38
 msgid ""
 "Currently, there are no circles on this service. Use the form below to "
 "create one."
@@ -313,7 +332,7 @@ msgstr ""
 "Es gibt derzeit keine Gemeinschaften auf diesem Dienst. Unten kannst du eine "
 "anlegen."
 
-#: snikket_web/templates/admin_circles.html:39
+#: snikket_web/templates/admin_circles.html:41
 msgid "New circle"
 msgstr "Neue Gemeinschaft"
 
@@ -395,7 +414,7 @@ msgstr ""
 "keinen Weg zurück!</strong>"
 
 #: snikket_web/templates/admin_delete_user.html:23
-#: snikket_web/templates/admin_edit_circle.html:15
+#: snikket_web/templates/admin_edit_circle.html:30
 #: snikket_web/templates/admin_edit_invite.html:45
 #: snikket_web/templates/admin_reset_user_password.html:25
 #: snikket_web/templates/user_logout.html:13
@@ -404,51 +423,68 @@ msgstr ""
 msgid "Back"
 msgstr "Zurück"
 
-#: snikket_web/templates/admin_edit_circle.html:4
+#: snikket_web/templates/admin_edit_circle.html:8
 #, python-format
 msgid "Edit circle %(circle_name)s"
 msgstr "Gemeinschaft %(circle_name)s bearbeiten"
 
-#: snikket_web/templates/admin_edit_circle.html:8
+#: snikket_web/templates/admin_edit_circle.html:12
 msgid "Circle information"
 msgstr "Gemeinschaftsinformationen"
 
 #: snikket_web/templates/admin_edit_circle.html:19
+#, fuzzy
+#| msgid "Email address"
+msgid "Group chat address"
+msgstr "E-Mail-Adresse"
+
+#: snikket_web/templates/admin_edit_circle.html:22
+#: snikket_web/templates/invite_success.html:15
+#, fuzzy
+#| msgid "Email address"
+msgid "Copy address"
+msgstr "E-Mail-Adresse"
+
+#: snikket_web/templates/admin_edit_circle.html:25
+msgid "This circle has no group chat associated."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:34
 msgid "Delete circle"
 msgstr "Gemeinschaft löschen"
 
-#: snikket_web/templates/admin_edit_circle.html:20
+#: snikket_web/templates/admin_edit_circle.html:35
 msgid "Deleting a circle does not delete any users in the circle."
 msgstr ""
 "Wenn eine Gemeinschaft gelöscht wird, werden die Benutzer die zu dieser "
 "Gemeinschaft gehören nicht gelöscht."
 
-#: snikket_web/templates/admin_edit_circle.html:25
+#: snikket_web/templates/admin_edit_circle.html:40
 msgid "Circle members"
 msgstr "Mitglieder der Gemeinschaft"
 
-#: snikket_web/templates/admin_edit_circle.html:40
+#: snikket_web/templates/admin_edit_circle.html:55
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Benutzer %(username)s aus der Gemeinschaft entfernen"
 
-#: snikket_web/templates/admin_edit_circle.html:48
+#: snikket_web/templates/admin_edit_circle.html:63
 msgid "This circle currently has no members."
 msgstr "Diese Gemeinschaft hat derzeit keine Mitglieder."
 
-#: snikket_web/templates/admin_edit_circle.html:50
+#: snikket_web/templates/admin_edit_circle.html:65
 msgid "Invite more members"
 msgstr "Mehr Mitglieder einladen"
 
-#: snikket_web/templates/admin_edit_circle.html:53
+#: snikket_web/templates/admin_edit_circle.html:68
 msgid "Add existing user"
 msgstr "Bestehenden Benuzter hinzufügen"
 
-#: snikket_web/templates/admin_edit_circle.html:64
+#: snikket_web/templates/admin_edit_circle.html:79
 msgid "No users left"
 msgstr "Keine Benutzer übrig"
 
-#: snikket_web/templates/admin_edit_circle.html:65
+#: snikket_web/templates/admin_edit_circle.html:80
 msgid "All users on this service are already in this circle."
 msgstr "Alle Benutzer dieses Dienstes sind bereits in dieser Gemeinschaft."
 
@@ -554,20 +590,24 @@ msgstr "Benutzer verwalten"
 msgid "Modify administrative user information or delete users."
 msgstr "Benutzerinformationen verändern oder Benutzer löschen."
 
-#: snikket_web/templates/admin_home.html:14
+#: snikket_web/templates/admin_home.html:12
+msgid "Create and manage social circles represented on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:15
 #: snikket_web/templates/admin_invites.html:8
 msgid "Manage invitations"
 msgstr "Einladungen verwalten"
 
-#: snikket_web/templates/admin_home.html:15
+#: snikket_web/templates/admin_home.html:16
 msgid "Create, revoke or view invitations."
 msgstr "Einladungen erzeugen, löschen oder anzeigen."
 
-#: snikket_web/templates/admin_home.html:18
+#: snikket_web/templates/admin_home.html:19
 msgid "Back to the main view"
 msgstr "Zurück zur Hauptseite"
 
-#: snikket_web/templates/admin_home.html:19
+#: snikket_web/templates/admin_home.html:20
 msgid "Go back to your user’s web portal page."
 msgstr "Zurück zur Startseite deines Benutzers."
 
@@ -768,12 +808,6 @@ msgid ""
 "Congratulations! You successfully registered on %(site_name)s as %(jid)s."
 msgstr ""
 
-#: snikket_web/templates/invite_success.html:15
-#, fuzzy
-#| msgid "Email address"
-msgid "Copy address"
-msgstr "E-Mail-Adresse"
-
 #: snikket_web/templates/invite_success.html:17
 msgid ""
 "You can not set up your legacy XMPP client with the above address and the "
@@ -918,10 +952,6 @@ msgstr "Willkommen!"
 msgid "Welcome home, %(user_name)s."
 msgstr "Willkommen zu Hause, %(user_name)s."
 
-#: snikket_web/templates/user_home.html:7
-msgid "Update profile"
-msgstr "Profil bearbeiten"
-
 #: snikket_web/templates/user_home.html:8
 msgid ""
 "Change display name, set avatar and configure visibility of your personal "
@@ -1003,6 +1033,9 @@ msgstr ""
 "Hier kannst du einstellen, wer deine Profilinformationen, wie Bild oder "
 "Anzeigename einsehen kann."
 
+#~ msgid "Apply"
+#~ msgstr "Übernehmen"
+
 #~ msgid "Copied to clipboard"
 #~ msgstr "Kopiert"
 
diff --git a/snikket_web/translations/en/LC_MESSAGES/messages.po b/snikket_web/translations/en/LC_MESSAGES/messages.po
index d48269d..7c8171b 100644
--- a/snikket_web/translations/en/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-26 15:06+0100\n"
+"POT-Creation-Date: 2021-01-26 16:12+0100\n"
 "PO-Revision-Date: 2021-01-23 17:06+0000\n"
 "Last-Translator: Matthew Wild <matthew@snikket.org>\n"
 "Language-Team: English <https://i18n.sotecware.net/projects/snikket/web-"
@@ -72,7 +72,7 @@ msgstr "Revoke"
 msgid "Name"
 msgstr "Name"
 
-#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:42
+#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:44
 msgid "Create circle"
 msgstr "Create circle"
 
@@ -80,9 +80,11 @@ msgstr "Create circle"
 msgid "Select user"
 msgstr "Select user"
 
-#: snikket_web/admin.py:328 snikket_web/user.py:68
-msgid "Apply"
-msgstr "Apply"
+#: snikket_web/admin.py:328
+#, fuzzy
+#| msgid "Create circle"
+msgid "Update circle"
+msgstr "Create circle"
 
 #: snikket_web/admin.py:332
 msgid "Delete circle permanently"
@@ -194,6 +196,10 @@ msgstr "Avatar"
 msgid "Profile visibility"
 msgstr "Profile visibility"
 
+#: snikket_web/templates/user_home.html:7 snikket_web/user.py:68
+msgid "Update profile"
+msgstr "Update profile"
+
 #: snikket_web/user.py:93
 msgid "Incorrect password"
 msgstr "Incorrect password"
@@ -281,35 +287,48 @@ msgstr "Admin dashboard"
 msgid "Manage circles"
 msgstr "Manage circles"
 
-#: snikket_web/templates/admin_circles.html:11
+#: snikket_web/templates/admin_circles.html:5
+msgid ""
+"<em>Circles</em> aim to help people who are in the same social circle find "
+"each other on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:6
+msgid ""
+"Users who are in the same circle will see each other in their contact list. "
+"In addition, each circle has a group chat where the circle members are "
+"included."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:13
 msgid "Circle name"
 msgstr "Circle name"
 
-#: snikket_web/templates/admin_circles.html:12
+#: snikket_web/templates/admin_circles.html:14
 msgid "Members"
 msgstr "Members"
 
-#: snikket_web/templates/admin_circles.html:13
+#: snikket_web/templates/admin_circles.html:15
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:14
 msgid "Actions"
 msgstr "Actions"
 
-#: snikket_web/templates/admin_circles.html:23
+#: snikket_web/templates/admin_circles.html:25
 #, python-format
 msgid "Create invitation to circle %(circle_name)s"
 msgstr "Create invitation to circle %(circle_name)s"
 
-#: snikket_web/templates/admin_circles.html:26
+#: snikket_web/templates/admin_circles.html:28
 #, python-format
 msgid "Show details of circle %(circle_name)s"
 msgstr "Show details of circle %(circle_name)s"
 
-#: snikket_web/templates/admin_circles.html:35
+#: snikket_web/templates/admin_circles.html:37
 msgid "No circles"
 msgstr "No circles"
 
-#: snikket_web/templates/admin_circles.html:36
+#: snikket_web/templates/admin_circles.html:38
 msgid ""
 "Currently, there are no circles on this service. Use the form below to "
 "create one."
@@ -317,7 +336,7 @@ msgstr ""
 "Currently, there are no circles on this service. Use the form below to "
 "create one."
 
-#: snikket_web/templates/admin_circles.html:39
+#: snikket_web/templates/admin_circles.html:41
 msgid "New circle"
 msgstr "New circle"
 
@@ -396,7 +415,7 @@ msgid ""
 msgstr ""
 
 #: snikket_web/templates/admin_delete_user.html:23
-#: snikket_web/templates/admin_edit_circle.html:15
+#: snikket_web/templates/admin_edit_circle.html:30
 #: snikket_web/templates/admin_edit_invite.html:45
 #: snikket_web/templates/admin_reset_user_password.html:25
 #: snikket_web/templates/user_logout.html:13
@@ -405,49 +424,66 @@ msgstr ""
 msgid "Back"
 msgstr "Back"
 
-#: snikket_web/templates/admin_edit_circle.html:4
+#: snikket_web/templates/admin_edit_circle.html:8
 #, python-format
 msgid "Edit circle %(circle_name)s"
 msgstr "Edit circle %(circle_name)s"
 
-#: snikket_web/templates/admin_edit_circle.html:8
+#: snikket_web/templates/admin_edit_circle.html:12
 msgid "Circle information"
 msgstr "Circle information"
 
 #: snikket_web/templates/admin_edit_circle.html:19
+#, fuzzy
+#| msgid "Email address"
+msgid "Group chat address"
+msgstr "Email address"
+
+#: snikket_web/templates/admin_edit_circle.html:22
+#: snikket_web/templates/invite_success.html:15
+#, fuzzy
+#| msgid "Email address"
+msgid "Copy address"
+msgstr "Email address"
+
+#: snikket_web/templates/admin_edit_circle.html:25
+msgid "This circle has no group chat associated."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:34
 msgid "Delete circle"
 msgstr "Delete circle"
 
-#: snikket_web/templates/admin_edit_circle.html:20
+#: snikket_web/templates/admin_edit_circle.html:35
 msgid "Deleting a circle does not delete any users in the circle."
 msgstr "Deleting a circle does not delete any users in the circle."
 
-#: snikket_web/templates/admin_edit_circle.html:25
+#: snikket_web/templates/admin_edit_circle.html:40
 msgid "Circle members"
 msgstr "Circle members"
 
-#: snikket_web/templates/admin_edit_circle.html:40
+#: snikket_web/templates/admin_edit_circle.html:55
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Remove user %(username)s from circle"
 
-#: snikket_web/templates/admin_edit_circle.html:48
+#: snikket_web/templates/admin_edit_circle.html:63
 msgid "This circle currently has no members."
 msgstr "This circle currently has no members."
 
-#: snikket_web/templates/admin_edit_circle.html:50
+#: snikket_web/templates/admin_edit_circle.html:65
 msgid "Invite more members"
 msgstr "Invite more members"
 
-#: snikket_web/templates/admin_edit_circle.html:53
+#: snikket_web/templates/admin_edit_circle.html:68
 msgid "Add existing user"
 msgstr "Add existing user"
 
-#: snikket_web/templates/admin_edit_circle.html:64
+#: snikket_web/templates/admin_edit_circle.html:79
 msgid "No users left"
 msgstr "No users left"
 
-#: snikket_web/templates/admin_edit_circle.html:65
+#: snikket_web/templates/admin_edit_circle.html:80
 msgid "All users on this service are already in this circle."
 msgstr "All users on this service are already in this circle."
 
@@ -547,20 +583,24 @@ msgstr "Manage users"
 msgid "Modify administrative user information or delete users."
 msgstr "Modify administrative user information or delete users."
 
-#: snikket_web/templates/admin_home.html:14
+#: snikket_web/templates/admin_home.html:12
+msgid "Create and manage social circles represented on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:15
 #: snikket_web/templates/admin_invites.html:8
 msgid "Manage invitations"
 msgstr "Manage invitations"
 
-#: snikket_web/templates/admin_home.html:15
+#: snikket_web/templates/admin_home.html:16
 msgid "Create, revoke or view invitations."
 msgstr "Create, revoke or view invitations."
 
-#: snikket_web/templates/admin_home.html:18
+#: snikket_web/templates/admin_home.html:19
 msgid "Back to the main view"
 msgstr "Back to the main view"
 
-#: snikket_web/templates/admin_home.html:19
+#: snikket_web/templates/admin_home.html:20
 msgid "Go back to your user’s web portal page."
 msgstr "Go back to your user’s web portal page."
 
@@ -761,12 +801,6 @@ msgid ""
 "Congratulations! You successfully registered on %(site_name)s as %(jid)s."
 msgstr ""
 
-#: snikket_web/templates/invite_success.html:15
-#, fuzzy
-#| msgid "Email address"
-msgid "Copy address"
-msgstr "Email address"
-
 #: snikket_web/templates/invite_success.html:17
 msgid ""
 "You can not set up your legacy XMPP client with the above address and the "
@@ -910,10 +944,6 @@ msgstr "Welcome!"
 msgid "Welcome home, %(user_name)s."
 msgstr "Welcome home, %(user_name)s."
 
-#: snikket_web/templates/user_home.html:7
-msgid "Update profile"
-msgstr "Update profile"
-
 #: snikket_web/templates/user_home.html:8
 msgid ""
 "Change display name, set avatar and configure visibility of your personal "
@@ -993,6 +1023,9 @@ msgstr ""
 "This section allows you to control who can see your profile information, "
 "like avatar and nickname."
 
+#~ msgid "Apply"
+#~ msgstr "Apply"
+
 #~ msgid "Copied to clipboard"
 #~ msgstr "Copied to clipboard"
 
diff --git a/snikket_web/translations/en_GB/LC_MESSAGES/messages.po b/snikket_web/translations/en_GB/LC_MESSAGES/messages.po
index ca4c5ab..c09fc05 100644
--- a/snikket_web/translations/en_GB/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/en_GB/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-26 15:06+0100\n"
+"POT-Creation-Date: 2021-01-26 16:12+0100\n"
 "PO-Revision-Date: 2021-01-23 17:06+0000\n"
 "Last-Translator: Matthew Wild <matthew@snikket.org>\n"
 "Language-Team: English (United Kingdom) <https://i18n.sotecware.net/projects/"
@@ -72,7 +72,7 @@ msgstr "Revoke"
 msgid "Name"
 msgstr "Name"
 
-#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:42
+#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:44
 msgid "Create circle"
 msgstr "Create circle"
 
@@ -80,9 +80,11 @@ msgstr "Create circle"
 msgid "Select user"
 msgstr "Select user"
 
-#: snikket_web/admin.py:328 snikket_web/user.py:68
-msgid "Apply"
-msgstr "Apply"
+#: snikket_web/admin.py:328
+#, fuzzy
+#| msgid "Create circle"
+msgid "Update circle"
+msgstr "Create circle"
 
 #: snikket_web/admin.py:332
 msgid "Delete circle permanently"
@@ -194,6 +196,10 @@ msgstr "Avatar"
 msgid "Profile visibility"
 msgstr "Profile visibility"
 
+#: snikket_web/templates/user_home.html:7 snikket_web/user.py:68
+msgid "Update profile"
+msgstr "Update profile"
+
 #: snikket_web/user.py:93
 msgid "Incorrect password"
 msgstr "Incorrect password"
@@ -281,35 +287,48 @@ msgstr "Admin dashboard"
 msgid "Manage circles"
 msgstr "Manage circles"
 
-#: snikket_web/templates/admin_circles.html:11
+#: snikket_web/templates/admin_circles.html:5
+msgid ""
+"<em>Circles</em> aim to help people who are in the same social circle find "
+"each other on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:6
+msgid ""
+"Users who are in the same circle will see each other in their contact list. "
+"In addition, each circle has a group chat where the circle members are "
+"included."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:13
 msgid "Circle name"
 msgstr "Circle name"
 
-#: snikket_web/templates/admin_circles.html:12
+#: snikket_web/templates/admin_circles.html:14
 msgid "Members"
 msgstr "Members"
 
-#: snikket_web/templates/admin_circles.html:13
+#: snikket_web/templates/admin_circles.html:15
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:14
 msgid "Actions"
 msgstr "Actions"
 
-#: snikket_web/templates/admin_circles.html:23
+#: snikket_web/templates/admin_circles.html:25
 #, python-format
 msgid "Create invitation to circle %(circle_name)s"
 msgstr "Create invitation to circle %(circle_name)s"
 
-#: snikket_web/templates/admin_circles.html:26
+#: snikket_web/templates/admin_circles.html:28
 #, python-format
 msgid "Show details of circle %(circle_name)s"
 msgstr "Show details of circle %(circle_name)s"
 
-#: snikket_web/templates/admin_circles.html:35
+#: snikket_web/templates/admin_circles.html:37
 msgid "No circles"
 msgstr "No circles"
 
-#: snikket_web/templates/admin_circles.html:36
+#: snikket_web/templates/admin_circles.html:38
 msgid ""
 "Currently, there are no circles on this service. Use the form below to "
 "create one."
@@ -317,7 +336,7 @@ msgstr ""
 "Currently, there are no circles on this service. Use the form below to "
 "create one."
 
-#: snikket_web/templates/admin_circles.html:39
+#: snikket_web/templates/admin_circles.html:41
 msgid "New circle"
 msgstr "New circle"
 
@@ -396,7 +415,7 @@ msgid ""
 msgstr ""
 
 #: snikket_web/templates/admin_delete_user.html:23
-#: snikket_web/templates/admin_edit_circle.html:15
+#: snikket_web/templates/admin_edit_circle.html:30
 #: snikket_web/templates/admin_edit_invite.html:45
 #: snikket_web/templates/admin_reset_user_password.html:25
 #: snikket_web/templates/user_logout.html:13
@@ -405,49 +424,66 @@ msgstr ""
 msgid "Back"
 msgstr "Back"
 
-#: snikket_web/templates/admin_edit_circle.html:4
+#: snikket_web/templates/admin_edit_circle.html:8
 #, python-format
 msgid "Edit circle %(circle_name)s"
 msgstr "Edit circle %(circle_name)s"
 
-#: snikket_web/templates/admin_edit_circle.html:8
+#: snikket_web/templates/admin_edit_circle.html:12
 msgid "Circle information"
 msgstr "Circle information"
 
 #: snikket_web/templates/admin_edit_circle.html:19
+#, fuzzy
+#| msgid "Email address"
+msgid "Group chat address"
+msgstr "Email address"
+
+#: snikket_web/templates/admin_edit_circle.html:22
+#: snikket_web/templates/invite_success.html:15
+#, fuzzy
+#| msgid "Email address"
+msgid "Copy address"
+msgstr "Email address"
+
+#: snikket_web/templates/admin_edit_circle.html:25
+msgid "This circle has no group chat associated."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:34
 msgid "Delete circle"
 msgstr "Delete circle"
 
-#: snikket_web/templates/admin_edit_circle.html:20
+#: snikket_web/templates/admin_edit_circle.html:35
 msgid "Deleting a circle does not delete any users in the circle."
 msgstr "Deleting a circle does not delete any users in the circle."
 
-#: snikket_web/templates/admin_edit_circle.html:25
+#: snikket_web/templates/admin_edit_circle.html:40
 msgid "Circle members"
 msgstr "Circle members"
 
-#: snikket_web/templates/admin_edit_circle.html:40
+#: snikket_web/templates/admin_edit_circle.html:55
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Remove user %(username)s from circle"
 
-#: snikket_web/templates/admin_edit_circle.html:48
+#: snikket_web/templates/admin_edit_circle.html:63
 msgid "This circle currently has no members."
 msgstr "This circle currently has no members."
 
-#: snikket_web/templates/admin_edit_circle.html:50
+#: snikket_web/templates/admin_edit_circle.html:65
 msgid "Invite more members"
 msgstr "Invite more members"
 
-#: snikket_web/templates/admin_edit_circle.html:53
+#: snikket_web/templates/admin_edit_circle.html:68
 msgid "Add existing user"
 msgstr "Add existing user"
 
-#: snikket_web/templates/admin_edit_circle.html:64
+#: snikket_web/templates/admin_edit_circle.html:79
 msgid "No users left"
 msgstr "No users left"
 
-#: snikket_web/templates/admin_edit_circle.html:65
+#: snikket_web/templates/admin_edit_circle.html:80
 msgid "All users on this service are already in this circle."
 msgstr "All users on this service are already in this circle."
 
@@ -547,20 +583,24 @@ msgstr "Manage users"
 msgid "Modify administrative user information or delete users."
 msgstr "Modify administrative user information or delete users."
 
-#: snikket_web/templates/admin_home.html:14
+#: snikket_web/templates/admin_home.html:12
+msgid "Create and manage social circles represented on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:15
 #: snikket_web/templates/admin_invites.html:8
 msgid "Manage invitations"
 msgstr "Manage invitations"
 
-#: snikket_web/templates/admin_home.html:15
+#: snikket_web/templates/admin_home.html:16
 msgid "Create, revoke or view invitations."
 msgstr "Create, revoke or view invitations."
 
-#: snikket_web/templates/admin_home.html:18
+#: snikket_web/templates/admin_home.html:19
 msgid "Back to the main view"
 msgstr "Back to the main view"
 
-#: snikket_web/templates/admin_home.html:19
+#: snikket_web/templates/admin_home.html:20
 msgid "Go back to your user’s web portal page."
 msgstr "Go back to your user’s web portal page."
 
@@ -759,12 +799,6 @@ msgid ""
 "Congratulations! You successfully registered on %(site_name)s as %(jid)s."
 msgstr ""
 
-#: snikket_web/templates/invite_success.html:15
-#, fuzzy
-#| msgid "Email address"
-msgid "Copy address"
-msgstr "Email address"
-
 #: snikket_web/templates/invite_success.html:17
 msgid ""
 "You can not set up your legacy XMPP client with the above address and the "
@@ -908,10 +942,6 @@ msgstr "Welcome!"
 msgid "Welcome home, %(user_name)s."
 msgstr "Welcome home, %(user_name)s."
 
-#: snikket_web/templates/user_home.html:7
-msgid "Update profile"
-msgstr "Update profile"
-
 #: snikket_web/templates/user_home.html:8
 msgid ""
 "Change display name, set avatar and configure visibility of your personal "
@@ -991,6 +1021,9 @@ msgstr ""
 "This section allows you to control who can see your profile information, "
 "like avatar and nickname."
 
+#~ msgid "Apply"
+#~ msgstr "Apply"
+
 #~ msgid "Copied to clipboard"
 #~ msgstr "Copied to clipboard"
 
diff --git a/snikket_web/translations/fr/LC_MESSAGES/messages.po b/snikket_web/translations/fr/LC_MESSAGES/messages.po
index 6109745..4b233ba 100644
--- a/snikket_web/translations/fr/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-26 15:06+0100\n"
+"POT-Creation-Date: 2021-01-26 16:12+0100\n"
 "PO-Revision-Date: 2021-01-26 14:06+0000\n"
 "Last-Translator: pep <pep@bouah.net>\n"
 "Language-Team: French <https://i18n.sotecware.net/projects/snikket/web-"
@@ -72,7 +72,7 @@ msgstr "Révoquer"
 msgid "Name"
 msgstr "Nom"
 
-#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:42
+#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:44
 msgid "Create circle"
 msgstr "Créer un cercle"
 
@@ -80,9 +80,11 @@ msgstr "Créer un cercle"
 msgid "Select user"
 msgstr "Sélectionner un utilisateur"
 
-#: snikket_web/admin.py:328 snikket_web/user.py:68
-msgid "Apply"
-msgstr "Appliquer"
+#: snikket_web/admin.py:328
+#, fuzzy
+#| msgid "Create circle"
+msgid "Update circle"
+msgstr "Créer un cercle"
 
 #: snikket_web/admin.py:332
 msgid "Delete circle permanently"
@@ -192,6 +194,10 @@ msgstr "Avatar"
 msgid "Profile visibility"
 msgstr "Visibilité du profil"
 
+#: snikket_web/templates/user_home.html:7 snikket_web/user.py:68
+msgid "Update profile"
+msgstr "Mettre à jour le profil"
+
 #: snikket_web/user.py:93
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
@@ -276,35 +282,48 @@ msgstr "Zone d’administration"
 msgid "Manage circles"
 msgstr "Gérer les cercles"
 
-#: snikket_web/templates/admin_circles.html:11
+#: snikket_web/templates/admin_circles.html:5
+msgid ""
+"<em>Circles</em> aim to help people who are in the same social circle find "
+"each other on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:6
+msgid ""
+"Users who are in the same circle will see each other in their contact list. "
+"In addition, each circle has a group chat where the circle members are "
+"included."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:13
 msgid "Circle name"
 msgstr "Nom du cercle"
 
-#: snikket_web/templates/admin_circles.html:12
+#: snikket_web/templates/admin_circles.html:14
 msgid "Members"
 msgstr "Membres"
 
-#: snikket_web/templates/admin_circles.html:13
+#: snikket_web/templates/admin_circles.html:15
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:14
 msgid "Actions"
 msgstr "Actions"
 
-#: snikket_web/templates/admin_circles.html:23
+#: snikket_web/templates/admin_circles.html:25
 #, python-format
 msgid "Create invitation to circle %(circle_name)s"
 msgstr "Créer une invitation au cercle %(circle_name)s"
 
-#: snikket_web/templates/admin_circles.html:26
+#: snikket_web/templates/admin_circles.html:28
 #, python-format
 msgid "Show details of circle %(circle_name)s"
 msgstr "Afficher les détails du cercle %(circle_name)s"
 
-#: snikket_web/templates/admin_circles.html:35
+#: snikket_web/templates/admin_circles.html:37
 msgid "No circles"
 msgstr "Aucun cercle"
 
-#: snikket_web/templates/admin_circles.html:36
+#: snikket_web/templates/admin_circles.html:38
 msgid ""
 "Currently, there are no circles on this service. Use the form below to "
 "create one."
@@ -312,7 +331,7 @@ msgstr ""
 "Il n’y a pas encore de cercle sur ce service. Utilisez le formulaire ci-"
 "dessous pour en créer un."
 
-#: snikket_web/templates/admin_circles.html:39
+#: snikket_web/templates/admin_circles.html:41
 msgid "New circle"
 msgstr "Nouveau cercle"
 
@@ -394,7 +413,7 @@ msgstr ""
 "impossible d'inverser l'opération !</strong>"
 
 #: snikket_web/templates/admin_delete_user.html:23
-#: snikket_web/templates/admin_edit_circle.html:15
+#: snikket_web/templates/admin_edit_circle.html:30
 #: snikket_web/templates/admin_edit_invite.html:45
 #: snikket_web/templates/admin_reset_user_password.html:25
 #: snikket_web/templates/user_logout.html:13
@@ -403,49 +422,66 @@ msgstr ""
 msgid "Back"
 msgstr "Retour"
 
-#: snikket_web/templates/admin_edit_circle.html:4
+#: snikket_web/templates/admin_edit_circle.html:8
 #, python-format
 msgid "Edit circle %(circle_name)s"
 msgstr "Éditer le cercle %(circle_name)s"
 
-#: snikket_web/templates/admin_edit_circle.html:8
+#: snikket_web/templates/admin_edit_circle.html:12
 msgid "Circle information"
 msgstr "Information sur le cercle"
 
 #: snikket_web/templates/admin_edit_circle.html:19
+#, fuzzy
+#| msgid "Email address"
+msgid "Group chat address"
+msgstr "Adresse email"
+
+#: snikket_web/templates/admin_edit_circle.html:22
+#: snikket_web/templates/invite_success.html:15
+#, fuzzy
+#| msgid "Email address"
+msgid "Copy address"
+msgstr "Adresse email"
+
+#: snikket_web/templates/admin_edit_circle.html:25
+msgid "This circle has no group chat associated."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:34
 msgid "Delete circle"
 msgstr "Supprimer le cercle"
 
-#: snikket_web/templates/admin_edit_circle.html:20
+#: snikket_web/templates/admin_edit_circle.html:35
 msgid "Deleting a circle does not delete any users in the circle."
 msgstr "Supprimer un cercle ne supprime aucun utilisateur dans le cercle."
 
-#: snikket_web/templates/admin_edit_circle.html:25
+#: snikket_web/templates/admin_edit_circle.html:40
 msgid "Circle members"
 msgstr "Membres du cercle"
 
-#: snikket_web/templates/admin_edit_circle.html:40
+#: snikket_web/templates/admin_edit_circle.html:55
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Supprime l’utilisateur %(username)s du cercle"
 
-#: snikket_web/templates/admin_edit_circle.html:48
+#: snikket_web/templates/admin_edit_circle.html:63
 msgid "This circle currently has no members."
 msgstr "Ce cercle n’a pas encore de membres."
 
-#: snikket_web/templates/admin_edit_circle.html:50
+#: snikket_web/templates/admin_edit_circle.html:65
 msgid "Invite more members"
 msgstr "Inviter plus de membres"
 
-#: snikket_web/templates/admin_edit_circle.html:53
+#: snikket_web/templates/admin_edit_circle.html:68
 msgid "Add existing user"
 msgstr "Ajouter un utilisateur existant"
 
-#: snikket_web/templates/admin_edit_circle.html:64
+#: snikket_web/templates/admin_edit_circle.html:79
 msgid "No users left"
 msgstr "Aucun utilisateur restant"
 
-#: snikket_web/templates/admin_edit_circle.html:65
+#: snikket_web/templates/admin_edit_circle.html:80
 msgid "All users on this service are already in this circle."
 msgstr "Tous les utilisateurs de ce service sont déjà dans ce cercle."
 
@@ -549,20 +585,24 @@ msgid "Modify administrative user information or delete users."
 msgstr ""
 "Modifier les informations des utilisateurs ou désinscrire des utilisateurs."
 
-#: snikket_web/templates/admin_home.html:14
+#: snikket_web/templates/admin_home.html:12
+msgid "Create and manage social circles represented on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:15
 #: snikket_web/templates/admin_invites.html:8
 msgid "Manage invitations"
 msgstr "Gérer les invitations"
 
-#: snikket_web/templates/admin_home.html:15
+#: snikket_web/templates/admin_home.html:16
 msgid "Create, revoke or view invitations."
 msgstr "Créer, révoquer, ou voir les invitations."
 
-#: snikket_web/templates/admin_home.html:18
+#: snikket_web/templates/admin_home.html:19
 msgid "Back to the main view"
 msgstr "Retour à la vue principale"
 
-#: snikket_web/templates/admin_home.html:19
+#: snikket_web/templates/admin_home.html:20
 msgid "Go back to your user’s web portal page."
 msgstr "Retourner à la page de l’utilisateur."
 
@@ -763,12 +803,6 @@ msgid ""
 "Congratulations! You successfully registered on %(site_name)s as %(jid)s."
 msgstr ""
 
-#: snikket_web/templates/invite_success.html:15
-#, fuzzy
-#| msgid "Email address"
-msgid "Copy address"
-msgstr "Adresse email"
-
 #: snikket_web/templates/invite_success.html:17
 msgid ""
 "You can not set up your legacy XMPP client with the above address and the "
@@ -912,10 +946,6 @@ msgstr "Bienvenue !"
 msgid "Welcome home, %(user_name)s."
 msgstr "Bienvenue à la maison, %(user_name)s."
 
-#: snikket_web/templates/user_home.html:7
-msgid "Update profile"
-msgstr "Mettre à jour le profil"
-
 #: snikket_web/templates/user_home.html:8
 msgid ""
 "Change display name, set avatar and configure visibility of your personal "
@@ -994,3 +1024,6 @@ msgid ""
 msgstr ""
 "Cette section permet de configurer qui peut voir votre profil, (e.g., "
 "avatar, pseudonyme)."
+
+#~ msgid "Apply"
+#~ msgstr "Appliquer"
diff --git a/snikket_web/translations/id/LC_MESSAGES/messages.po b/snikket_web/translations/id/LC_MESSAGES/messages.po
index 7267947..288c12f 100644
--- a/snikket_web/translations/id/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/id/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-26 15:06+0100\n"
+"POT-Creation-Date: 2021-01-26 16:12+0100\n"
 "PO-Revision-Date: 2021-01-26 14:06+0000\n"
 "Last-Translator: uira <inboxriau@andriana.id>\n"
 "Language-Team: Indonesian <https://i18n.sotecware.net/projects/snikket/web-"
@@ -72,7 +72,7 @@ msgstr "Batalkan"
 msgid "Name"
 msgstr "Nama"
 
-#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:42
+#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:44
 msgid "Create circle"
 msgstr "Buat kelompok"
 
@@ -80,9 +80,11 @@ msgstr "Buat kelompok"
 msgid "Select user"
 msgstr "Pilih pengguna"
 
-#: snikket_web/admin.py:328 snikket_web/user.py:68
-msgid "Apply"
-msgstr "Terapkan"
+#: snikket_web/admin.py:328
+#, fuzzy
+#| msgid "Create circle"
+msgid "Update circle"
+msgstr "Buat kelompok"
 
 #: snikket_web/admin.py:332
 msgid "Delete circle permanently"
@@ -192,6 +194,10 @@ msgstr "Gambar profil"
 msgid "Profile visibility"
 msgstr "Visibilitas profil"
 
+#: snikket_web/templates/user_home.html:7 snikket_web/user.py:68
+msgid "Update profile"
+msgstr "Perbaharui profil"
+
 #: snikket_web/user.py:93
 msgid "Incorrect password"
 msgstr "Kata kunci salah"
@@ -277,35 +283,48 @@ msgstr "Wewenang Administrator"
 msgid "Manage circles"
 msgstr "Atur kelompok"
 
-#: snikket_web/templates/admin_circles.html:11
+#: snikket_web/templates/admin_circles.html:5
+msgid ""
+"<em>Circles</em> aim to help people who are in the same social circle find "
+"each other on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:6
+msgid ""
+"Users who are in the same circle will see each other in their contact list. "
+"In addition, each circle has a group chat where the circle members are "
+"included."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:13
 msgid "Circle name"
 msgstr "Nama kelompok"
 
-#: snikket_web/templates/admin_circles.html:12
+#: snikket_web/templates/admin_circles.html:14
 msgid "Members"
 msgstr "Anggota"
 
-#: snikket_web/templates/admin_circles.html:13
+#: snikket_web/templates/admin_circles.html:15
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:14
 msgid "Actions"
 msgstr "Tindakan"
 
-#: snikket_web/templates/admin_circles.html:23
+#: snikket_web/templates/admin_circles.html:25
 #, python-format
 msgid "Create invitation to circle %(circle_name)s"
 msgstr "Buat undangan untuk kelompok %(circle_name)s"
 
-#: snikket_web/templates/admin_circles.html:26
+#: snikket_web/templates/admin_circles.html:28
 #, python-format
 msgid "Show details of circle %(circle_name)s"
 msgstr "Tampilkan detil dari kelompok %(circle_name)s"
 
-#: snikket_web/templates/admin_circles.html:35
+#: snikket_web/templates/admin_circles.html:37
 msgid "No circles"
 msgstr "Tidak ada kelompok"
 
-#: snikket_web/templates/admin_circles.html:36
+#: snikket_web/templates/admin_circles.html:38
 msgid ""
 "Currently, there are no circles on this service. Use the form below to "
 "create one."
@@ -313,7 +332,7 @@ msgstr ""
 "Saat ini tidak ada kelompok dalam layanan. Gunakan formulir dibawah untuk "
 "membuat."
 
-#: snikket_web/templates/admin_circles.html:39
+#: snikket_web/templates/admin_circles.html:41
 msgid "New circle"
 msgstr "Kelompok baru"
 
@@ -395,7 +414,7 @@ msgstr ""
 "strong>"
 
 #: snikket_web/templates/admin_delete_user.html:23
-#: snikket_web/templates/admin_edit_circle.html:15
+#: snikket_web/templates/admin_edit_circle.html:30
 #: snikket_web/templates/admin_edit_invite.html:45
 #: snikket_web/templates/admin_reset_user_password.html:25
 #: snikket_web/templates/user_logout.html:13
@@ -404,51 +423,68 @@ msgstr ""
 msgid "Back"
 msgstr "Kembali"
 
-#: snikket_web/templates/admin_edit_circle.html:4
+#: snikket_web/templates/admin_edit_circle.html:8
 #, python-format
 msgid "Edit circle %(circle_name)s"
 msgstr "Edit kelompok %(circle_name)s"
 
-#: snikket_web/templates/admin_edit_circle.html:8
+#: snikket_web/templates/admin_edit_circle.html:12
 msgid "Circle information"
 msgstr "Informasi kelompok"
 
 #: snikket_web/templates/admin_edit_circle.html:19
+#, fuzzy
+#| msgid "Email address"
+msgid "Group chat address"
+msgstr "Alamat email"
+
+#: snikket_web/templates/admin_edit_circle.html:22
+#: snikket_web/templates/invite_success.html:15
+#, fuzzy
+#| msgid "Email address"
+msgid "Copy address"
+msgstr "Alamat email"
+
+#: snikket_web/templates/admin_edit_circle.html:25
+msgid "This circle has no group chat associated."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:34
 msgid "Delete circle"
 msgstr "Hapus kelompok"
 
-#: snikket_web/templates/admin_edit_circle.html:20
+#: snikket_web/templates/admin_edit_circle.html:35
 msgid "Deleting a circle does not delete any users in the circle."
 msgstr ""
 "Menghapus kelompok tidak menghapus satu pun pengguna di dalam kelompok "
 "tersebut."
 
-#: snikket_web/templates/admin_edit_circle.html:25
+#: snikket_web/templates/admin_edit_circle.html:40
 msgid "Circle members"
 msgstr "Anggota kelompok"
 
-#: snikket_web/templates/admin_edit_circle.html:40
+#: snikket_web/templates/admin_edit_circle.html:55
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Hapus pengguna %(username)s dari kelompok"
 
-#: snikket_web/templates/admin_edit_circle.html:48
+#: snikket_web/templates/admin_edit_circle.html:63
 msgid "This circle currently has no members."
 msgstr "Kelompok ini sedang tidak memiliki anggota."
 
-#: snikket_web/templates/admin_edit_circle.html:50
+#: snikket_web/templates/admin_edit_circle.html:65
 msgid "Invite more members"
 msgstr "Ajak lebih banyak anggota"
 
-#: snikket_web/templates/admin_edit_circle.html:53
+#: snikket_web/templates/admin_edit_circle.html:68
 msgid "Add existing user"
 msgstr "Tambahkan pengguna yang ada"
 
-#: snikket_web/templates/admin_edit_circle.html:64
+#: snikket_web/templates/admin_edit_circle.html:79
 msgid "No users left"
 msgstr "Tidak ada pengguna tersisa"
 
-#: snikket_web/templates/admin_edit_circle.html:65
+#: snikket_web/templates/admin_edit_circle.html:80
 msgid "All users on this service are already in this circle."
 msgstr "Semua pengguna layanan ini sudah ada di kelompok ini."
 
@@ -552,20 +588,24 @@ msgstr "Atur pengguna"
 msgid "Modify administrative user information or delete users."
 msgstr "Ubah informasi pengguna atau hapus pengguna."
 
-#: snikket_web/templates/admin_home.html:14
+#: snikket_web/templates/admin_home.html:12
+msgid "Create and manage social circles represented on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:15
 #: snikket_web/templates/admin_invites.html:8
 msgid "Manage invitations"
 msgstr "Kelola undangan"
 
-#: snikket_web/templates/admin_home.html:15
+#: snikket_web/templates/admin_home.html:16
 msgid "Create, revoke or view invitations."
 msgstr "Buat, batalkan, atau lihat undangan."
 
-#: snikket_web/templates/admin_home.html:18
+#: snikket_web/templates/admin_home.html:19
 msgid "Back to the main view"
 msgstr "Kembali ke halaman utama"
 
-#: snikket_web/templates/admin_home.html:19
+#: snikket_web/templates/admin_home.html:20
 msgid "Go back to your user’s web portal page."
 msgstr "Kembali ke halaman portal web pengguna Anda."
 
@@ -764,12 +804,6 @@ msgid ""
 "Congratulations! You successfully registered on %(site_name)s as %(jid)s."
 msgstr ""
 
-#: snikket_web/templates/invite_success.html:15
-#, fuzzy
-#| msgid "Email address"
-msgid "Copy address"
-msgstr "Alamat email"
-
 #: snikket_web/templates/invite_success.html:17
 msgid ""
 "You can not set up your legacy XMPP client with the above address and the "
@@ -913,10 +947,6 @@ msgstr "Selamat datang!"
 msgid "Welcome home, %(user_name)s."
 msgstr "Selamat kembali ke rumah, %(user_name)s."
 
-#: snikket_web/templates/user_home.html:7
-msgid "Update profile"
-msgstr "Perbaharui profil"
-
 #: snikket_web/templates/user_home.html:8
 msgid ""
 "Change display name, set avatar and configure visibility of your personal "
@@ -997,6 +1027,9 @@ msgstr ""
 "Bagian ini memungkinkan Anda untuk mengontrol siapa yang bisa melihat profil "
 "Anda, seperti avatar dan nama panggilan."
 
+#~ msgid "Apply"
+#~ msgstr "Terapkan"
+
 #~ msgid "Copied to clipboard"
 #~ msgstr "Kopi ke papan klip"
 
diff --git a/snikket_web/translations/ja/LC_MESSAGES/messages.po b/snikket_web/translations/ja/LC_MESSAGES/messages.po
index 48f04d4..1678640 100644
--- a/snikket_web/translations/ja/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-26 15:06+0100\n"
+"POT-Creation-Date: 2021-01-26 16:12+0100\n"
 "PO-Revision-Date: 2021-01-26 14:06+0000\n"
 "Last-Translator: pep <pep@bouah.net>\n"
 "Language-Team: Japanese <https://i18n.sotecware.net/projects/snikket/web-"
@@ -72,7 +72,7 @@ msgstr "取り消す"
 msgid "Name"
 msgstr "名"
 
-#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:42
+#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:44
 msgid "Create circle"
 msgstr "サークルを作成"
 
@@ -80,9 +80,11 @@ msgstr "サークルを作成"
 msgid "Select user"
 msgstr "ユーザー選択"
 
-#: snikket_web/admin.py:328 snikket_web/user.py:68
-msgid "Apply"
-msgstr "決定"
+#: snikket_web/admin.py:328
+#, fuzzy
+#| msgid "Create circle"
+msgid "Update circle"
+msgstr "サークルを作成"
 
 #: snikket_web/admin.py:332
 msgid "Delete circle permanently"
@@ -192,6 +194,10 @@ msgstr "アバター"
 msgid "Profile visibility"
 msgstr ""
 
+#: snikket_web/templates/user_home.html:7 snikket_web/user.py:68
+msgid "Update profile"
+msgstr ""
+
 #: snikket_web/user.py:93
 msgid "Incorrect password"
 msgstr "パスワード不正"
@@ -268,41 +274,54 @@ msgstr "管理"
 msgid "Manage circles"
 msgstr "サークル管理"
 
-#: snikket_web/templates/admin_circles.html:11
+#: snikket_web/templates/admin_circles.html:5
+msgid ""
+"<em>Circles</em> aim to help people who are in the same social circle find "
+"each other on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:6
+msgid ""
+"Users who are in the same circle will see each other in their contact list. "
+"In addition, each circle has a group chat where the circle members are "
+"included."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:13
 msgid "Circle name"
 msgstr "サークル名"
 
-#: snikket_web/templates/admin_circles.html:12
+#: snikket_web/templates/admin_circles.html:14
 msgid "Members"
 msgstr "サークル員"
 
-#: snikket_web/templates/admin_circles.html:13
+#: snikket_web/templates/admin_circles.html:15
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:14
 msgid "Actions"
 msgstr "操作"
 
-#: snikket_web/templates/admin_circles.html:23
+#: snikket_web/templates/admin_circles.html:25
 #, fuzzy, python-format
 msgid "Create invitation to circle %(circle_name)s"
 msgstr "紹介"
 
-#: snikket_web/templates/admin_circles.html:26
+#: snikket_web/templates/admin_circles.html:28
 #, fuzzy, python-format
 msgid "Show details of circle %(circle_name)s"
 msgstr "詳細"
 
-#: snikket_web/templates/admin_circles.html:35
+#: snikket_web/templates/admin_circles.html:37
 msgid "No circles"
 msgstr "なし"
 
-#: snikket_web/templates/admin_circles.html:36
+#: snikket_web/templates/admin_circles.html:38
 msgid ""
 "Currently, there are no circles on this service. Use the form below to "
 "create one."
 msgstr ""
 
-#: snikket_web/templates/admin_circles.html:39
+#: snikket_web/templates/admin_circles.html:41
 msgid "New circle"
 msgstr "新しいサークル"
 
@@ -379,7 +398,7 @@ msgid ""
 msgstr ""
 
 #: snikket_web/templates/admin_delete_user.html:23
-#: snikket_web/templates/admin_edit_circle.html:15
+#: snikket_web/templates/admin_edit_circle.html:30
 #: snikket_web/templates/admin_edit_invite.html:45
 #: snikket_web/templates/admin_reset_user_password.html:25
 #: snikket_web/templates/user_logout.html:13
@@ -388,49 +407,66 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:4
+#: snikket_web/templates/admin_edit_circle.html:8
 #, python-format
 msgid "Edit circle %(circle_name)s"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:8
+#: snikket_web/templates/admin_edit_circle.html:12
 msgid "Circle information"
 msgstr ""
 
 #: snikket_web/templates/admin_edit_circle.html:19
+#, fuzzy
+#| msgid "Address"
+msgid "Group chat address"
+msgstr "アドレス"
+
+#: snikket_web/templates/admin_edit_circle.html:22
+#: snikket_web/templates/invite_success.html:15
+#, fuzzy
+#| msgid "Address"
+msgid "Copy address"
+msgstr "アドレス"
+
+#: snikket_web/templates/admin_edit_circle.html:25
+msgid "This circle has no group chat associated."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:34
 msgid "Delete circle"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:20
+#: snikket_web/templates/admin_edit_circle.html:35
 msgid "Deleting a circle does not delete any users in the circle."
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:25
+#: snikket_web/templates/admin_edit_circle.html:40
 msgid "Circle members"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:40
+#: snikket_web/templates/admin_edit_circle.html:55
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:48
+#: snikket_web/templates/admin_edit_circle.html:63
 msgid "This circle currently has no members."
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:50
+#: snikket_web/templates/admin_edit_circle.html:65
 msgid "Invite more members"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:53
+#: snikket_web/templates/admin_edit_circle.html:68
 msgid "Add existing user"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:64
+#: snikket_web/templates/admin_edit_circle.html:79
 msgid "No users left"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:65
+#: snikket_web/templates/admin_edit_circle.html:80
 msgid "All users on this service are already in this circle."
 msgstr ""
 
@@ -524,20 +560,24 @@ msgstr ""
 msgid "Modify administrative user information or delete users."
 msgstr ""
 
-#: snikket_web/templates/admin_home.html:14
+#: snikket_web/templates/admin_home.html:12
+msgid "Create and manage social circles represented on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:15
 #: snikket_web/templates/admin_invites.html:8
 msgid "Manage invitations"
 msgstr ""
 
-#: snikket_web/templates/admin_home.html:15
+#: snikket_web/templates/admin_home.html:16
 msgid "Create, revoke or view invitations."
 msgstr ""
 
-#: snikket_web/templates/admin_home.html:18
+#: snikket_web/templates/admin_home.html:19
 msgid "Back to the main view"
 msgstr ""
 
-#: snikket_web/templates/admin_home.html:19
+#: snikket_web/templates/admin_home.html:20
 msgid "Go back to your user’s web portal page."
 msgstr ""
 
@@ -733,12 +773,6 @@ msgid ""
 "Congratulations! You successfully registered on %(site_name)s as %(jid)s."
 msgstr ""
 
-#: snikket_web/templates/invite_success.html:15
-#, fuzzy
-#| msgid "Address"
-msgid "Copy address"
-msgstr "アドレス"
-
 #: snikket_web/templates/invite_success.html:17
 msgid ""
 "You can not set up your legacy XMPP client with the above address and the "
@@ -880,10 +914,6 @@ msgstr ""
 msgid "Welcome home, %(user_name)s."
 msgstr ""
 
-#: snikket_web/templates/user_home.html:7
-msgid "Update profile"
-msgstr ""
-
 #: snikket_web/templates/user_home.html:8
 msgid ""
 "Change display name, set avatar and configure visibility of your personal "
@@ -951,3 +981,6 @@ msgid ""
 "This section allows you to control who can see your profile information, "
 "like avatar and nickname."
 msgstr ""
+
+#~ msgid "Apply"
+#~ msgstr "決定"
diff --git a/snikket_web/translations/pl/LC_MESSAGES/messages.po b/snikket_web/translations/pl/LC_MESSAGES/messages.po
index 1d2d5c9..e216d55 100644
--- a/snikket_web/translations/pl/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/pl/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-26 15:06+0100\n"
+"POT-Creation-Date: 2021-01-26 16:12+0100\n"
 "PO-Revision-Date: 2021-01-26 14:06+0000\n"
 "Last-Translator: misiek <migelazur@mailbox.org>\n"
 "Language-Team: Polish <https://i18n.sotecware.net/projects/snikket/web-"
@@ -73,7 +73,7 @@ msgstr "Unieważnij"
 msgid "Name"
 msgstr "Nazwa"
 
-#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:42
+#: snikket_web/admin.py:279 snikket_web/templates/admin_circles.html:44
 msgid "Create circle"
 msgstr "Utwórz krąg"
 
@@ -81,9 +81,11 @@ msgstr "Utwórz krąg"
 msgid "Select user"
 msgstr "Wybierz użytkownika"
 
-#: snikket_web/admin.py:328 snikket_web/user.py:68
-msgid "Apply"
-msgstr "Zapisz"
+#: snikket_web/admin.py:328
+#, fuzzy
+#| msgid "Create circle"
+msgid "Update circle"
+msgstr "Utwórz krąg"
 
 #: snikket_web/admin.py:332
 msgid "Delete circle permanently"
@@ -193,6 +195,10 @@ msgstr "Awatar"
 msgid "Profile visibility"
 msgstr "Widoczność profilu"
 
+#: snikket_web/templates/user_home.html:7 snikket_web/user.py:68
+msgid "Update profile"
+msgstr "Zaktualizuj profil"
+
 #: snikket_web/user.py:93
 msgid "Incorrect password"
 msgstr "Nieprawidłowe hasło"
@@ -278,35 +284,48 @@ msgstr "Panel administracyjny"
 msgid "Manage circles"
 msgstr "Zarządzaj kręgami"
 
-#: snikket_web/templates/admin_circles.html:11
+#: snikket_web/templates/admin_circles.html:5
+msgid ""
+"<em>Circles</em> aim to help people who are in the same social circle find "
+"each other on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:6
+msgid ""
+"Users who are in the same circle will see each other in their contact list. "
+"In addition, each circle has a group chat where the circle members are "
+"included."
+msgstr ""
+
+#: snikket_web/templates/admin_circles.html:13
 msgid "Circle name"
 msgstr "Nazwa kręgu"
 
-#: snikket_web/templates/admin_circles.html:12
+#: snikket_web/templates/admin_circles.html:14
 msgid "Members"
 msgstr "Członkowie"
 
-#: snikket_web/templates/admin_circles.html:13
+#: snikket_web/templates/admin_circles.html:15
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:14
 msgid "Actions"
 msgstr "Akcje"
 
-#: snikket_web/templates/admin_circles.html:23
+#: snikket_web/templates/admin_circles.html:25
 #, python-format
 msgid "Create invitation to circle %(circle_name)s"
 msgstr "Utwórz zaproszenie do kręgu %(circle_name)s"
 
-#: snikket_web/templates/admin_circles.html:26
+#: snikket_web/templates/admin_circles.html:28
 #, python-format
 msgid "Show details of circle %(circle_name)s"
 msgstr "Pokaż szczegóły kręgu %(circle_name)s"
 
-#: snikket_web/templates/admin_circles.html:35
+#: snikket_web/templates/admin_circles.html:37
 msgid "No circles"
 msgstr "Brak kręgów"
 
-#: snikket_web/templates/admin_circles.html:36
+#: snikket_web/templates/admin_circles.html:38
 msgid ""
 "Currently, there are no circles on this service. Use the form below to "
 "create one."
@@ -314,7 +333,7 @@ msgstr ""
 "Obecnie nie ma kręgów na tym serwerze. Użyj poniższego formularza, by "
 "stworzyć nowy."
 
-#: snikket_web/templates/admin_circles.html:39
+#: snikket_web/templates/admin_circles.html:41
 msgid "New circle"
 msgstr "Nowy krąg"
 
@@ -396,7 +415,7 @@ msgstr ""
 "cofnąć!</strong>"
 
 #: snikket_web/templates/admin_delete_user.html:23
-#: snikket_web/templates/admin_edit_circle.html:15
+#: snikket_web/templates/admin_edit_circle.html:30
 #: snikket_web/templates/admin_edit_invite.html:45
 #: snikket_web/templates/admin_reset_user_password.html:25
 #: snikket_web/templates/user_logout.html:13
@@ -405,49 +424,66 @@ msgstr ""
 msgid "Back"
 msgstr "Wstecz"
 
-#: snikket_web/templates/admin_edit_circle.html:4
+#: snikket_web/templates/admin_edit_circle.html:8
 #, python-format
 msgid "Edit circle %(circle_name)s"
 msgstr "Edytuj krąg %(circle_name)s"
 
-#: snikket_web/templates/admin_edit_circle.html:8
+#: snikket_web/templates/admin_edit_circle.html:12
 msgid "Circle information"
 msgstr "Informacje o kręgu"
 
 #: snikket_web/templates/admin_edit_circle.html:19
+#, fuzzy
+#| msgid "Email address"
+msgid "Group chat address"
+msgstr "Adres e-mail"
+
+#: snikket_web/templates/admin_edit_circle.html:22
+#: snikket_web/templates/invite_success.html:15
+#, fuzzy
+#| msgid "Email address"
+msgid "Copy address"
+msgstr "Adres e-mail"
+
+#: snikket_web/templates/admin_edit_circle.html:25
+msgid "This circle has no group chat associated."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:34
 msgid "Delete circle"
 msgstr "Usuń krąg"
 
-#: snikket_web/templates/admin_edit_circle.html:20
+#: snikket_web/templates/admin_edit_circle.html:35
 msgid "Deleting a circle does not delete any users in the circle."
 msgstr "Usunięcie kręgu nie usuwa z serwera jego użytkowników."
 
-#: snikket_web/templates/admin_edit_circle.html:25
+#: snikket_web/templates/admin_edit_circle.html:40
 msgid "Circle members"
 msgstr "Członkowie kręgu"
 
-#: snikket_web/templates/admin_edit_circle.html:40
+#: snikket_web/templates/admin_edit_circle.html:55
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Usuń użytkownika %(username)s z kręgu"
 
-#: snikket_web/templates/admin_edit_circle.html:48
+#: snikket_web/templates/admin_edit_circle.html:63
 msgid "This circle currently has no members."
 msgstr "Ten krąg nie ma obecnie członków."
 
-#: snikket_web/templates/admin_edit_circle.html:50
+#: snikket_web/templates/admin_edit_circle.html:65
 msgid "Invite more members"
 msgstr "Zaproś więcej użytkowników"
 
-#: snikket_web/templates/admin_edit_circle.html:53
+#: snikket_web/templates/admin_edit_circle.html:68
 msgid "Add existing user"
 msgstr "Dodaj istniejącego użytkownika"
 
-#: snikket_web/templates/admin_edit_circle.html:64
+#: snikket_web/templates/admin_edit_circle.html:79
 msgid "No users left"
 msgstr "Brak użytkowników do dodania"
 
-#: snikket_web/templates/admin_edit_circle.html:65
+#: snikket_web/templates/admin_edit_circle.html:80
 msgid "All users on this service are already in this circle."
 msgstr "Wszyscy użytkownicy tego serwera są obecnie w tym kręgu."
 
@@ -551,20 +587,24 @@ msgstr "Zarządzaj użytkownikami"
 msgid "Modify administrative user information or delete users."
 msgstr "Zmień informacje o użytkowniku lub usuń użytkowników."
 
-#: snikket_web/templates/admin_home.html:14
+#: snikket_web/templates/admin_home.html:12
+msgid "Create and manage social circles represented on your service."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:15
 #: snikket_web/templates/admin_invites.html:8
 msgid "Manage invitations"
 msgstr "Zarządzaj zaproszeniami"
 
-#: snikket_web/templates/admin_home.html:15
+#: snikket_web/templates/admin_home.html:16
 msgid "Create, revoke or view invitations."
 msgstr "Utwórz, unieważnij lub przeglądaj zaproszenia."
 
-#: snikket_web/templates/admin_home.html:18
+#: snikket_web/templates/admin_home.html:19
 msgid "Back to the main view"
 msgstr "Powrót do strony głównej"
 
-#: snikket_web/templates/admin_home.html:19
+#: snikket_web/templates/admin_home.html:20
 msgid "Go back to your user’s web portal page."
 msgstr "Wróć do swojej strony użytkownika."
 
@@ -765,12 +805,6 @@ msgid ""
 "Congratulations! You successfully registered on %(site_name)s as %(jid)s."
 msgstr ""
 
-#: snikket_web/templates/invite_success.html:15
-#, fuzzy
-#| msgid "Email address"
-msgid "Copy address"
-msgstr "Adres e-mail"
-
 #: snikket_web/templates/invite_success.html:17
 msgid ""
 "You can not set up your legacy XMPP client with the above address and the "
@@ -914,10 +948,6 @@ msgstr "Witaj!"
 msgid "Welcome home, %(user_name)s."
 msgstr "Witaj w domu, %(user_name)s."
 
-#: snikket_web/templates/user_home.html:7
-msgid "Update profile"
-msgstr "Zaktualizuj profil"
-
 #: snikket_web/templates/user_home.html:8
 msgid ""
 "Change display name, set avatar and configure visibility of your personal "
@@ -996,6 +1026,9 @@ msgstr ""
 "Ta sekcja pozwoli ci na zarządzenie widocznością informacji o twoim profilu "
 "przez innych, jak awatar lub pseudonim."
 
+#~ msgid "Apply"
+#~ msgstr "Zapisz"
+
 #~ msgid "Copied to clipboard"
 #~ msgstr "Skopiowano do schowka"