diff --git a/docs/admin/01_core_concepts.rst b/docs/admin/01_core_concepts.rst
index 680ee618367334efff3cde1befcf082d9fdeb8f2..cdd49c7183217897b09cf1fda5575307e0a5f08c 100644
--- a/docs/admin/01_core_concepts.rst
+++ b/docs/admin/01_core_concepts.rst
@@ -4,7 +4,7 @@ Concepts of the AlekSIS core
 The AlekSIS core provides functionality and data models as a base for
 all apps.
 
-.. _sec:SchoolTerms:
+.. _core-concept-schoolterm:
 
 The concept of school terms
 ---------------------------
@@ -32,7 +32,7 @@ of all school terms and buttons to create, edit or delete school terms.
 Please be aware that there can be only one school term at time and each
 school term needs a unique name.
 
-.. _sec:Persons:
+.. _core-concept-person:
 
 The concept of persons
 ----------------------
@@ -49,7 +49,7 @@ information like the following:
 -  Address details
 -  Photo
 -  Relation to guardians
--  Primary group (e. g. a class or a tutor group, cf. [@sec:Groups])
+-  Primary group (e. g. a class or a tutor group, cf. :ref:`core-concept-group`)
 
 Except for the name, all data points are optional, so you can decide on
 your own (and based on your local data protection laws) which data should be
@@ -74,7 +74,7 @@ The main method to manage persons is the view under
 ``People → Persons``. To add person to groups, you have to open the
 respective group and set the person as a member or an owner.
 
-.. _sec:Groups:
+.. _core-concept-group:
 
 The concept of groups
 ---------------------
@@ -95,18 +95,20 @@ class or a course varies from school term to school term. In order to
 archive historical data according to local laws, these groups have to be
 separeted which is solved by linking them to a school term.
 
-Manage group types
-~~~~~~~~~~~~~~~~~~
-
-You can manage your local group types by opening the menu entry
-``People → Group types`` as an admin user.
-
 Manage groups
 ~~~~~~~~~~~~~
 
 Groups are managed on the page ``People → Groups``. There you can
 search, view, create, change and delete groups.
 
+.. _core-concept-grouptype:
+
+Manage group types
+~~~~~~~~~~~~~~~~~~
+
+You can manage your local group types by opening the menu entry
+``People → Group types`` as an admin user.
+
 Import school terms, persons and groups from other data sources
 ---------------------------------------------------------------
 
diff --git a/docs/user/01_personal_account.rst b/docs/user/01_personal_account.rst
index da1c435fa7a77302343cf693cd40bf0886d04385..e43e41328b5c5a1e7e7179c656b71fc7c945051b 100644
--- a/docs/user/01_personal_account.rst
+++ b/docs/user/01_personal_account.rst
@@ -5,7 +5,7 @@ Each logged in user has several options to provided through the AlekSIS
 core. Which of these items are display depends on whether the user has a
 person and what your system administrator has configured.
 
-.. _sec:Notifications:
+.. _core-notifications:
 
 Notifications
 -------------
@@ -16,7 +16,7 @@ changes). Notifications are shown on the dashboard and the notifications
 page reachable over the menu entry ``Notifications``. In addition to
 that, notifications can be sent to users through several communication
 channels. These channels can be switched on or off in your personal
-preferences (cf. [@sec:PersonalPreferences]).
+preferences (cf. :ref:`core-user-preferences`).
 
 Setup two-factor authentication
 -------------------------------
@@ -58,7 +58,7 @@ Reachable under ``Account → Me``, this page shows the personal
 information saved about you in the system. If activated, you can upload
 a picture of yourself or edit some information.
 
-.. _sec:PersonalPreferences:
+.. _core-user-preferences:
 
 Personal preferences
 --------------------
@@ -74,7 +74,7 @@ apps.
    -  **Name format for addressing**: Here you can select how AlekSIS
       should address you.
    -  **Channels to use for notifications:** This channel is used to
-      sent notifications to you (cf. [@sec:Notifications]).
+      sent notifications to you (cf. :ref:`core-notifications`).
 
 Third-party accounts
 --------------------
@@ -83,6 +83,9 @@ If you logged in using a third-party account (e. g. a Google or
 Microsoft account), you can manage the connections to these accounts on
 the page ``Account → Third-party accounts``.
 
+The feature to use third-party accounts needs to be enabled by
+an administrator, as described in :doc:`../admin/04_socialaccounts`.
+
 Authorized applications
 -----------------------