diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js
index 9b89e55ce..7378c13e2 100644
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -664,13 +664,17 @@ define([
                 });
             }
         };
-        var limit = Cryptpad.account.limit;
-        var usage = Cryptpad.account.usage;
-        if (typeof(limit) !== 'number' || typeof(usage) !== 'number') {
-            todo("invalid types");
-        } else if (Cryptpad.isLoggedIn() && usage >= limit) {
-            todo(void 0, true);
-        } else { todo(void 0, false); }
+
+        Cryptpad.isOverPinLimit(function (e, isOver, data) {
+            var limit = data.limit;
+            var usage = data.usage;
+            if (typeof(limit) !== 'number' || typeof(usage) !== 'number') {
+                todo("invalid types");
+            } else if (Cryptpad.isLoggedIn() && usage >= limit) {
+                todo(void 0, true);
+            } else { todo(void 0, false); }
+        });
+
         return $limit;
     };