diff --git a/webadmin/src/views/activity.js b/webadmin/src/views/activity.js
index 1af91b86e..7dc609be1 100644
--- a/webadmin/src/views/activity.js
+++ b/webadmin/src/views/activity.js
@@ -43,10 +43,6 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
         });
     }
 
-    Client.onReady(function () {
-        fetchEventLogs();
-    });
-
     $scope.showNextPage = function () {
         $scope.currentPage++;
         fetchEventLogs();
@@ -62,4 +58,8 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
     $scope.updateFilter = function () {
         fetchEventLogs();
     };
+
+    Client.onReady(function () {
+        fetchEventLogs();
+    });
 }]);
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index bcb8aceb8..8fe64d121 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -471,13 +471,15 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         });
     }
 
-    Client.refreshUserInfo(function (error) {
-        if (error) return console.error(error);
+    Client.onReady(function () {
+        Client.refreshUserInfo(function (error) {
+            if (error) return console.error(error);
 
-        if ($scope.user.admin) {
-            fetchUsers();
-            fetchGroups();
-        }
+            if ($scope.user.admin) {
+                fetchUsers();
+                fetchGroups();
+            }
+        });
     });
 
     // setup all the dialog focus handling
diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js
index 8d888b5c4..46e2f60de 100644
--- a/webadmin/src/views/appstore.js
+++ b/webadmin/src/views/appstore.js
@@ -373,28 +373,31 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
         });
     }
 
-    (function refresh() {
-        $scope.ready = false;
+    Client.onReady(function () {
+        (function refresh() {
+            $scope.ready = false;
 
-        getAppList(function (error, apps) {
-            if (error) {
-                console.error(error);
-                return $timeout(refresh, 1000);
-            }
+            getAppList(function (error, apps) {
+                if (error) {
+                    console.error(error);
+                    return $timeout(refresh, 1000);
+                }
 
-            $scope.apps = apps;
+                $scope.apps = apps;
 
-            // show install app dialog immediately if an app id was passed in the query
-            hashChangeListener();
+                // show install app dialog immediately if an app id was passed in the query
+                hashChangeListener();
 
-            if ($scope.user.admin) {
-                fetchUsers();
-                fetchGroups();
-            }
+                if ($scope.user.admin) {
+                    fetchUsers();
+                    fetchGroups();
+                }
 
-            $scope.ready = true;
-        });
-    })();
+                $scope.ready = true;
+            });
+        })();
+
+    });
 
     $('#appInstallModal').on('hide.bs.modal', function () {
         $location.path('/appstore', false).search({ version: undefined });
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index 68f32d07d..efb24bcf3 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -389,7 +389,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         });
     }
 
-    refresh();
+    Client.onReady(refresh);
 
     // setup all the dialog focus handling
     ['userAddModal', 'userRemoveModal', 'userEditModal', 'groupAddModal', 'groupRemoveModal'].forEach(function (id) {