diff --git a/docs/CHANGES.md b/docs/CHANGES.md
index 47d7b2ec1..7c54108b0 100755
--- a/docs/CHANGES.md
+++ b/docs/CHANGES.md
@@ -16,6 +16,7 @@
   Instead, `converse.initialize` returns a promise which will resolve once
   initialization is complete. [jcbrand]
 - New event ['reconnecting'](https://conversejs.org/docs/html/development.html#reconnecting) [jcbrand]
+- #723, #734: Bugfix. `converse.rooms.open` ignored the `muc_nickname_from_jid` setting. [jcbrand]
 
 ## 2.0.1 (2016-11-07)
 - #203 New configuration setting [muc_domain](https://conversejs.org/docs/html/configuration.html#muc_domain) [jcbrand]
diff --git a/src/converse-muc.js b/src/converse-muc.js
index 94e1b3bf5..f5a90abe6 100755
--- a/src/converse-muc.js
+++ b/src/converse-muc.js
@@ -1831,7 +1831,7 @@
                             attrs = {};
                         }
                         var fetcher = converse.chatboxviews.showChat.bind(converse.chatboxviews);
-                        if (!attrs.nick) {
+                        if (!attrs.nick && converse.muc_nickname_from_jid) {
                             attrs.nick = Strophe.getNodeFromJid(converse.bare_jid);
                         }
                         if (typeof jids === "undefined") {