diff --git a/user_manual/contents.rst b/user_manual/contents.rst
index 9493ff15f..401d6e70f 100644
--- a/user_manual/contents.rst
+++ b/user_manual/contents.rst
@@ -14,6 +14,7 @@ Table of Contents
     pim/index
     documents
     userpreferences
+    session_management
     external_storage/index
     bookmarks
     
\ No newline at end of file
diff --git a/user_manual/images/settings_devices.png b/user_manual/images/settings_devices.png
new file mode 100644
index 000000000..2ce35bf30
Binary files /dev/null and b/user_manual/images/settings_devices.png differ
diff --git a/user_manual/images/settings_devices_add.png b/user_manual/images/settings_devices_add.png
new file mode 100644
index 000000000..b7ab2bbe8
Binary files /dev/null and b/user_manual/images/settings_devices_add.png differ
diff --git a/user_manual/images/settings_sessions.png b/user_manual/images/settings_sessions.png
new file mode 100644
index 000000000..2db3f64b4
Binary files /dev/null and b/user_manual/images/settings_sessions.png differ
diff --git a/user_manual/session_management.rst b/user_manual/session_management.rst
new file mode 100644
index 000000000..7486570a1
--- /dev/null
+++ b/user_manual/session_management.rst
@@ -0,0 +1,44 @@
+=====================================
+Manage Connected Browsers and Devices
+=====================================
+
+The personal settings page allows you to have an overview on the connected
+browsers and devices.
+
+Managing Connected Browsers
+===========================
+In the list of connected browsers you see which browsers connected to your
+account recently:
+
+  .. figure:: images/settings_sessions.png
+     :alt: List of browser sessions.
+
+You can use the trash icon to disconnect any of the browsers in the list.
+
+Managing Devices
+================
+In the list of connected devices you see all the devices and clients you
+generated a device password for and their last activity:
+
+  .. figure:: images/settings_devices.png
+     :alt: List of connected devices.
+
+You can use the trash icon to disconnect any of the devices in the list.
+
+At the bottom of the list you find a button to create a new device-specific
+password. You can choose a name to identify the token later. The generated
+password is used for configuring the new client. Ideally, generate individual
+tokens for every device you connect to your account, so you can disconnect
+those individually if necessary.
+
+  .. figure:: images/settings_devices_add.png
+     :alt: Adding a new device.
+
+.. note:: You have only access to the device password when creating it,
+   ownCloud will not save the plain password, hence it's recommended to
+   enter the password on the new client immediately.
+
+
+.. note:: If two-factor authentication is enabled for your account,
+   device-specific passwords are the only way to configure clients. The
+   client will deny connections of clients using your login password then.
diff --git a/user_manual/userpreferences.rst b/user_manual/userpreferences.rst
index b80550aba..7f97c54fc 100644
--- a/user_manual/userpreferences.rst
+++ b/user_manual/userpreferences.rst
@@ -34,7 +34,7 @@ include the following.
 * Email address.
 * Lists your Group memberships.
 * Manage your password.
-* Manage connected browsers and devices.
+* :doc:`userpreferences`.
 * Choose the language for your ownCloud interface.
 * Links to desktop and mobile apps.
 * Manage your Activity stream and notifications.