diff --git a/CHANGES.md b/CHANGES.md
index 7acd8252a..8e932197f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,14 +7,14 @@
 - It's now possible to navigate the emoji-picker via the keyboard arrow keys.
 
 - Add support for [notifications about affiliation change for users not in a room](https://xmpp.org/extensions/xep-0045.html#example-196)
-- Add support for [XEP-0424 Message Retraction](http://localhost:3080/extensions/xep-0424.html)
-- Add support for [XEP-0425 Message Moderation](http://localhost:3080/extensions/xep-0425.html)
+- Add support for [XEP-0424 Message Retraction](http://xmpps.org/extensions/xep-0424.html)
+- Add support for [XEP-0425 Message Moderation](http://xmpps.org/extensions/xep-0425.html)
 
 - New API [\_converse.api.headlines](https://conversejs.org/docs/html/api/-_converse.api.headlines.html#.get)
 - New config option [allow_message_retraction](https://conversejs.org/docs/html/configuration.html#allow-message-retraction)
 - New config option [muc-show-logs-before-join](https://conversejs.org/docs/html/configuration.html#muc-show-logs-before-join)
 - New config option [muc_mention_autocomplete_filter](https://conversejs.org/docs/html/configuration.html#muc-mention-autocomplete-filter)
-- New config option [muc_mention_autocomplete_show_avatar](https://conversejs.org/docs/html/configuration.html#muc-mention-autocomplete-show_avatar)
+- New config option [muc_mention_autocomplete_show_avatar](https://conversejs.org/docs/html/configuration.html#muc-mention-autocomplete-show-avatar)
 - New config option [persistent_store](https://conversejs.org/docs/html/configuration.html#persistent-store)
 
 - Initial support for sending custom emojis. Currently only between Converse
diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
index abdb5a14b..6596f6b8b 100644
--- a/docs/source/configuration.rst
+++ b/docs/source/configuration.rst
@@ -1167,6 +1167,16 @@ user joins or leaves the MUC. This setting only has an effect if
 
 See https://xmpp.org/extensions/xep-0045.html#changepres
 
+muc_show_logs_before_join
+-------------------------
+
+* Default: ``false``
+
+If set to ``true``, when opening a MUC for the first time (or if you don't have
+a nickname configured for it), you'll see the message history (if the
+server supports [XEP-0313 Message Archive Management](https://xmpp.org/extensions/xep-0313.html))
+and the nickname form at the bottom.
+
 .. _`nickname`:
 
 nickname