diff --git a/addons/auth_totp/views/user_preferences.xml b/addons/auth_totp/views/user_preferences.xml
index 004379ddc54..9255b19a920 100644
--- a/addons/auth_totp/views/user_preferences.xml
+++ b/addons/auth_totp/views/user_preferences.xml
@@ -114,6 +114,8 @@
                             <span class="alert alert-info" role="status">
                                 <i class="fa fa-warning"/>
                                 Two-factor authentication not enabled
+                                <a href="https://www.odoo.com/documentation/user/general/auth/2fa.html"
+                                   title="What is this?" class="o_doc_link" target="_blank"></a>
                             </span>
                             <button name="totp_enable_wizard" type="object" string="Enable two-factor authentication"
                                     class="btn btn-info mx-3"/>
@@ -124,6 +126,8 @@
                             <span class="text-success">
                                 <i class="fa fa-check-circle"/>
                                 Two-factor authentication enabled
+                                <a href="https://www.odoo.com/documentation/user/general/auth/2fa.html"
+                                   title="What is this?" class="o_doc_link" target="_blank"></a>
                             </span>
                             <button name="totp_disable" type="object" string="(Disable two-factor authentication)"
                                     class="btn btn-link text-muted"/>
diff --git a/doc/webservices/images/account-security.png b/doc/webservices/images/account-security.png
new file mode 100644
index 00000000000..cf91646dd64
Binary files /dev/null and b/doc/webservices/images/account-security.png differ
diff --git a/doc/webservices/images/delete-key.png b/doc/webservices/images/delete-key.png
new file mode 100644
index 00000000000..df14cb35dfc
Binary files /dev/null and b/doc/webservices/images/delete-key.png differ
diff --git a/doc/webservices/images/preferences.png b/doc/webservices/images/preferences.png
new file mode 100644
index 00000000000..1ce36717e32
Binary files /dev/null and b/doc/webservices/images/preferences.png differ
diff --git a/doc/webservices/odoo.rst b/doc/webservices/odoo.rst
index 9297ccff11a..dfd99177ebd 100644
--- a/doc/webservices/odoo.rst
+++ b/doc/webservices/odoo.rst
@@ -146,6 +146,50 @@ parameters
                 username = "admin",
                 password = <insert password for your admin user (default: admin)>;
 
+API Keys
+''''''''
+
+.. versionadded:: 14.0
+
+Odoo has support for **api keys** and (depending on modules or settings) may
+**require** these keys to perform webservice operations.
+
+The way to use API Keys in your scripts is to simply replace your **password**
+by the key. The login remains in-use. You should store the API Key as carefully
+as the password as they essentially provide the same access to your user
+account (although they can not be used to log-in via the interface).
+
+In order to add a key to your account, simply go to your
+:guilabel:`Preferences` (or :guilabel:`My Profile`):
+
+.. figure:: images/preferences.png
+    :align: center
+
+then open the :guilabel:`Account Security` tab, and click
+:guilabel:`New API Key`:
+
+.. figure:: images/account-security.png
+    :align: center
+
+Input a description for the key, **this description should be as clear and
+complete as possible**: it is the only way you will have to identify your keys
+later and know whether you should remove them or keep them around.
+
+Click :guilabel:`Generate Key`, then copy the key provided. **Store this key
+carefully**: it is equivalent to your password, and just like your password
+the system will not be able to retrieve or show the key again later on. If you lose
+this key, you will have to create a new one (and probably delete the one you
+lost).
+
+Once you have keys configured on your account, they will appear above the
+:guilabel:`New API Key` button, and you will be able to delete them:
+
+.. figure:: images/delete-key.png
+    :align: center
+
+**A deleted API key can not be undeleted or re-set**. You will have to generate
+a new key and update all the places where you used the old one.
+
 demo
 ''''
 
diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml
index 7325ba0739f..1695b95f177 100644
--- a/odoo/addons/base/views/res_users_views.xml
+++ b/odoo/addons/base/views/res_users_views.xml
@@ -479,7 +479,11 @@
                                     <button name="preference_change_password" type="object" string="Change password" class="btn btn-secondary"/>
                                 </div>
                             </group>
-                            <group string="Developer API Keys">
+                            <group string="Developer API Keys" help="test">
+                                <a href="https://www.odoo.com/documentation/master/webservice/odoo.html#api-keys" target="_blank">
+                                    <i class="fa fa-fw o_button_icon fa-arrow-right"></i>
+                                    <span>Documentation</span>
+                                </a>
                                 <div colspan="2" attrs="{'invisible': [('api_key_ids', '=', [])]}">
                                     <field name="api_key_ids" nolabel="1" colspan="4" readonly="0">
                                         <tree editable="bottom" create="false" delete="false">