diff --git a/www/common/migrate-user-object.js b/www/common/migrate-user-object.js
index 54c1c6111..4c6e38d85 100644
--- a/www/common/migrate-user-object.js
+++ b/www/common/migrate-user-object.js
@@ -197,7 +197,7 @@ define([
             }, 500);
             progress(0, 0);*/
         }).nThen(function () {
-            cb();
+            setTimeout(cb);
         });
     };
 });
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index ad9982030..19b4a4fe4 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1644,14 +1644,16 @@ define([
                 });
                 userObject.migrate(waitFor());
             }).nThen(function (waitFor) {
+                Store.initAnonRpc(null, null, waitFor());
+                Store.initRpc(null, null, waitFor());
+            }).nThen(function (waitFor) {
+                loadMailbox(waitFor);
                 Migrate(proxy, waitFor(), function (version, progress) {
                     postMessage(clientId, 'LOADING_DRIVE', {
                         state: (2 + (version / 10)),
                         progress: progress
                     });
                 });
-                Store.initAnonRpc(null, null, waitFor());
-                Store.initRpc(null, null, waitFor());
             }).nThen(function (waitFor) {
                 postMessage(clientId, 'LOADING_DRIVE', {
                     state: 3
@@ -1661,7 +1663,6 @@ define([
                 loadMessenger();
                 loadCursor();
                 loadOnlyOffice();
-                loadMailbox(waitFor);
                 loadUniversal(Profile, 'profile', waitFor);
                 cleanFriendRequests();
             }).nThen(function () {