--- a/configuration.md	Sun May 14 11:26:04 2017 +0200
+++ b/configuration.md	Sun May 14 11:41:37 2017 +0200
@@ -62,11 +62,14 @@
 `app_id`    | Application ID (generated by madonctl)
 `app_secret`| Application secret (generated by madonctl)
 `token`     | User Mastodon token (generated at login time)
-`login`     | User login (email) - optional
-`password`  | User password - optional
-`safe_mode` | If set to `true`, the configuration cannot be dumped with *config dump*
+`login`     | User login (email)
+`password`  | User password
+`safe_mode` | If set to *true*, the configuration cannot be dumped with *config dump*
 `default_output`     | Default output format; one of plain, yaml, json or theme
 `template_directory` | The local directory where templates and themes are installed
 `default_theme`      | Default theme name (e.g. *ansi*)
 `color`              | Default color setting (on, off, auto)
-`verbose`            | Set to true for verbose mode
+`verbose`            | Set to *true* for verbose mode
+
+Note that if a token is set, the login and the password are not necessary.\
+It is recommended to reuse the same token (and it will be faster).