diff --git a/docs/CHANGES.md b/docs/CHANGES.md
index 107b56194..f2cae9aa1 100755
--- a/docs/CHANGES.md
+++ b/docs/CHANGES.md
@@ -6,6 +6,9 @@
   For details, refer to the [relevant documentation](https://conversejs.org/docs/html/developer_api.html#the-rooms-grouping) [jcbrand]
 - Bugfix: Arrays in configuration settings were ignored. [jcbrand]
 - Bugfix: Chatboxes aren't closed when logging out. [jcbrand]
+- Bugfix: Trying to save data on the `ControlBox` model before `ChatBoxes`
+  collection has its `browserStorage` configured.
+  Causes `Error: A "url" property or function must be specified`. [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-core.js b/src/converse-core.js
index 10777377a..e25ea35e0 100755
--- a/src/converse-core.js
+++ b/src/converse-core.js
@@ -673,8 +673,8 @@
         this.onStatusInitialized = function () {
             converse.registerIntervalHandler();
             converse.initRoster();
-            converse.populateRoster();
             converse.chatboxes.onConnected();
+            converse.populateRoster();
             converse.registerPresenceHandler();
             converse.giveFeedback(__('Contacts'));
             if (typeof converse.callback === 'function') {
@@ -729,8 +729,8 @@
             // Give event handlers a chance to register views for the roster
             // and its groups, before we start populating.
             converse.emit('rosterReadyAfterReconnection');
-            converse.populateRoster();
             converse.chatboxes.onConnected();
+            converse.populateRoster();
             converse.xmppstatus.sendPresence();
             converse.emit('reconnected');
             converse.giveFeedback(__('Contacts'));