diff --git a/src/js/index.js b/src/js/index.js
index e5f131260..38e970753 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -19,33 +19,6 @@ if (search.accessToken) {
     window.location.search = encodeURIComponent(Object.keys(search).map(function (key) { return key + '=' + search[key]; }).join('&'));
 }
 
-// poor man's async in the global namespace
-function asyncForEachParallel(items, handler, callback) {
-    var alreadyDone = 0;
-    var errored = false;
-
-    if (items.length === 0) return callback();
-
-    function done(error) {
-        // do nothing if already called back due to error
-        if (errored) return;
-
-        if (error) {
-            errored = true;
-            return callback(error);
-        }
-
-        ++alreadyDone;
-
-        // we are done
-        if (alreadyDone === items.length) callback();
-    }
-
-    for (var i = 0; i < items.length; ++i) {
-        handler(items[i], done);
-    }
-}
-
 function asyncForEach(items, handler, callback) {
     var cur = 0;
 
diff --git a/src/views/users.js b/src/views/users.js
index ba944b0f9..b93b09a7b 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -2,7 +2,6 @@
 
 /* global angular */
 /* global Clipboard */
-/* global asyncForEachParallel */
 /* global async */
 /* global $ */
 
@@ -602,7 +601,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         Client.getUsers($scope.userSearchString, $scope.currentPage, $scope.pageItems.value, function (error, results) {
             if (error) return console.error(error);
 
-            asyncForEachParallel(results, function (result, iteratorDone) {
+            async.eachLimit(results, 20, function (result, iteratorDone) {
                 Client.getUser(result.id, function (error, user) {
                     if (error) return iteratorDone(error);
 
@@ -622,7 +621,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         Client.getGroups(function (error, results) {
             if (error) return console.error(error);
 
-            asyncForEachParallel(results, function (result, iteratorDone) {
+            async.eachLimit(results, 20, function (result, iteratorDone) {
                 Client.getGroup(result.id, function (error, group) {
                     if (error) return iteratorDone(error);