diff --git a/CHANGES.md b/CHANGES.md
index a8385003b..93b6f7e25 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,7 @@
 
 - Bugfix. Handler not triggered when submitting MUC password form 2nd time
 - Bugfix. MUC features weren't being refreshed when saving the config form
+- #1222 Adding a bookmark should prefill the room name
 
 ## 4.0.2 (2018-10-02)
 
diff --git a/src/templates/chatroom_bookmark_form.html b/src/templates/chatroom_bookmark_form.html
index c95f05fe3..523037bc0 100644
--- a/src/templates/chatroom_bookmark_form.html
+++ b/src/templates/chatroom_bookmark_form.html
@@ -3,7 +3,7 @@
         <legend>{{{o.heading}}}</legend>
         <fieldset class="form-group">
             <label for="converse_muc_bookmark_name">{{{o.label_name}}}</label>
-            <input class="form-control" type="text" name="name" required="required" id="converse_muc_bookmark_name"/>
+            <input class="form-control" type="text" value="{{{o.name}}}" name="name" required="required" id="converse_muc_bookmark_name"/>
         </fieldset>
         <fieldset class="form-group">
             <label for="converse_muc_bookmark_nick">{{{o.label_nick}}}</label>