diff --git a/docs/config.md b/docs/config.md
index 738978ba3f..cb501da02a 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -100,7 +100,7 @@ For a good example, see https://riot.im/develop/config.json.
 1. `disable_3pid_login`: Disables 3rd party identity options on login and registration form
     Defaults to false (3rd party identity options are shown).
 1. `default_federate`: Default option for room federation when creating a room
-    Defaults to false (room federation enabled).
+    Defaults to true (room federation enabled).
 
 Note that `index.html` also has an og:image meta tag that is set to an image
 hosted on riot.im. This is the image used if links to your copy of Riot
diff --git a/docs/jitsi.md b/docs/jitsi.md
index 1d2c5536a7..ba4f9edc14 100644
--- a/docs/jitsi.md
+++ b/docs/jitsi.md
@@ -40,7 +40,8 @@ should start a new conference on your Jitsi server.
 domain will appear later in the URL as a configuration parameter.
 
 **Hint**: If you want everyone on your homeserver to use the same Jitsi server by
-default, set the following on your homeserver's `/.well-known/matrix/client` config:
+default, and you are using riot-web 1.6 or newer, set the following on your homeserver's 
+`/.well-known/matrix/client` config:
 ```json
 {
   "im.vector.riot.jitsi": {