diff --git a/src/js/client.js b/src/js/client.js
index b786524f9..80a000fd9 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -862,11 +862,17 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         });
     };
 
-    Client.prototype.getUsers = function (callback) {
+    Client.prototype.getUsers = function (page, perPage, callback) {
+        if (typeof page === 'function') {
+            callback = page;
+            page = 1;
+            perPage = 1000;
+        }
+
         var config = {
             params: {
-                page: 1,
-                per_page: 1000
+                page: page,
+                per_page: perPage
             }
         };
 
diff --git a/src/views/users.html b/src/views/users.html
index d777b9cae..f427d1f27 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -295,52 +295,67 @@
     </h1>
   </div>
 
-  <div class="card card-large">
-      <div class="grid-item-top">
-          <div class="row ng-hide" ng-show="!ready">
-              <div class="col-lg-12 text-center">
-                  <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
-              </div>
-          </div>
-          <div class="row animateMeOpacity ng-hide" ng-show="ready">
-              <div class="col-lg-12">
-                  <table class="table table-hover">
-                      <thead>
-                          <tr>
-                              <th style="width: 0.5%;"></th>
-                              <th style="width:45%">User</th>
-                              <th style="width:49.5%" class="hidden-xs hidden-sm">Groups</th>
-                              <th style="width: 5%" class="text-right">Actions</th>
-                          </tr>
-                      </thead>
-                      <tbody>
-                          <tr ng-repeat="user in users">
-                              <td>
-                                  <i class="fa fa-briefcase arrow" ng-show="user.admin" uib-tooltip="This user can manage apps, groups and other users"></i>
-                              </td>
-                              <td class="hand elide-table-cell" ng-click="useredit.show(user)" ng-show="user.username">
-                                  {{ user.displayName }} &nbsp; <span class="text-muted">{{ user.username }}</span>
-                              </td>
-                              <td class="hand elide-table-cell" ng-click="useredit.show(user)" ng-hide="user.username">
-                                  <span class="text-muted" uib-tooltip="User is not activated yet">{{ user.fallbackEmail }}</span>
-                              </td>
-                              <td class="text-left hand elide-table-cell hidden-xs hidden-sm" ng-click="useredit.show(user)">
-                                  <span class="group-badge" ng-repeat="groupId in user.groupIds">
-                                      {{ groupsById[groupId].name }}
-                                  </span>
-                              </td>
-
-                              <td class="text-right no-wrap" style="vertical-align: bottom">
-                                  <button ng-show="!isMe(user)" class="btn btn-xs btn-default" ng-click="invitation.show(user)" uib-tooltip="Create setup link"><i class="fa fa-paper-plane"></i></button>
-                                  <button class="btn btn-xs btn-default" ng-click="useredit.show(user)" uib-tooltip="Edit User"><i class="fa fa-pencil-alt"></i></button>
-                                  <button ng-show="!isMe(user)" class="btn btn-xs btn-danger" ng-click="userremove.show(user)" uib-tooltip="Remove User"><i class="far fa-trash-alt"></i></button>
-                              </td>
-                          </tr>
-                      </tbody>
-                  </table>
-              </div>
-          </div>
+  <div class="row">
+    <div class="col-lg-12">
+      <div class="filter">
+        <input type="text" class="form-control" style="min-width: 350px;" ng-model="search" ng-model-options="{ debounce: 1000 }" ng-change="updateFilter()" placeholder="Search"/>
+        <select class="form-control" ng-model="pageItems" ng-options="a.name for a in pageItemCount" ng-change="updateFilter(true)"></select>
       </div>
+      <div class="pagination pull-right">
+        <button class="btn btn-default btn-outline" ng-click="showPrevPage()" ng-disabled="userRefreshBusy || currentPage <= 1"><i class="fa fa-angle-double-left"></i> prev</button>
+        <button class="btn btn-default btn-outline" ng-click="showNextPage()" ng-disabled="userRefreshBusy || users.length < pageItems.value">next <i class="fa fa-angle-double-right"></i></button>
+      </div>
+    </div>
+  </div>
+
+  <div>
+    <div class="card card-large">
+      <div class="grid-item-top">
+        <div class="row ng-hide" ng-show="!ready">
+          <div class="col-lg-12 text-center">
+            <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
+          </div>
+        </div>
+        <div class="row animateMeOpacity ng-hide" ng-show="ready">
+          <div class="col-lg-12">
+            <table class="table table-hover">
+              <thead>
+                <tr>
+                  <th style="width: 0.5%;"></th>
+                  <th style="width:45%">User</th>
+                  <th style="width:49.5%" class="hidden-xs hidden-sm">Groups</th>
+                  <th style="width: 5%" class="text-right">Actions</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr ng-repeat="user in users">
+                  <td>
+                    <i class="fa fa-briefcase arrow" ng-show="user.admin" uib-tooltip="This user can manage apps, groups and other users"></i>
+                  </td>
+                  <td class="hand elide-table-cell" ng-click="useredit.show(user)" ng-show="user.username">
+                    {{ user.displayName }} &nbsp; <span class="text-muted">{{ user.username }}</span>
+                  </td>
+                  <td class="hand elide-table-cell" ng-click="useredit.show(user)" ng-hide="user.username">
+                    <span class="text-muted" uib-tooltip="User is not activated yet">{{ user.fallbackEmail }}</span>
+                  </td>
+                  <td class="text-left hand elide-table-cell hidden-xs hidden-sm" ng-click="useredit.show(user)">
+                    <span class="group-badge" ng-repeat="groupId in user.groupIds">
+                      {{ groupsById[groupId].name }}
+                    </span>
+                  </td>
+
+                  <td class="text-right no-wrap" style="vertical-align: bottom">
+                    <button ng-show="!isMe(user)" class="btn btn-xs btn-default" ng-click="invitation.show(user)" uib-tooltip="Create setup link"><i class="fa fa-paper-plane"></i></button>
+                    <button class="btn btn-xs btn-default" ng-click="useredit.show(user)" uib-tooltip="Edit User"><i class="fa fa-pencil-alt"></i></button>
+                    <button ng-show="!isMe(user)" class="btn btn-xs btn-danger" ng-click="userremove.show(user)" uib-tooltip="Remove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove UserRemove User"><i class="far fa-trash-alt"></i></button>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 
   <br/>
diff --git a/src/views/users.js b/src/views/users.js
index a38079315..81a7f8f1f 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -4,6 +4,7 @@
 /* global Clipboard:false */
 /* global asyncForEach:false */
 /* global asyncSeries:false */
+/* global $:false */
 
 angular.module('Application').controller('UsersController', ['$scope', '$location', '$timeout', 'Client', function ($scope, $location, $timeout, Client) {
     Client.onReady(function () { if (!Client.getUserInfo().admin) $location.path('/'); });
@@ -16,6 +17,15 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     $scope.config = Client.getConfig();
     $scope.userInfo = Client.getUserInfo();
 
+    $scope.currentPage = 1;
+    $scope.pageItemCount = [
+        { name: 'Show 20 per page', value: 20 },
+        { name: 'Show 50 per page', value: 50 },
+        { name: 'Show 100 per page', value: 100 }
+    ];
+    $scope.pageItems = $scope.pageItemCount[0];
+    $scope.userRefreshBusy = false;
+
     $scope.groupMembers = function (group) {
         return group.userIds.filter(function (uid) { return !!$scope.usersById[uid]; }).map(function (uid) { return $scope.usersById[uid].username || $scope.usersById[uid].email; }).join(' ');
     };
@@ -442,7 +452,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     function getUsers(callback) {
         var users = [ ];
 
-        Client.getUsers(function (error, results) {
+        Client.getUsers($scope.currentPage, $scope.pageItems.value, function (error, results) {
             if (error) return console.error(error);
 
             asyncForEach(results, function (result, iteratorDone) {
@@ -479,6 +489,23 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         });
     }
 
+    function refreshUsers() {
+        $scope.userRefreshBusy = true;
+
+        getUsers(function (error, result) {
+            if (error) return console.error('Unable to get user listing.', error);
+
+            angular.copy(result, $scope.users);
+            $scope.usersById = { };
+            for (var i = 0; i < result.length; i++) {
+                $scope.usersById[result[i].id] = result[i];
+            }
+
+            $scope.ready = true;
+            $scope.userRefreshBusy = false;
+        });
+    }
+
     function refresh() {
         getGroups(function (error, result) {
             if (error) return console.error('Unable to get group listing.', error);
@@ -489,20 +516,26 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 $scope.groupsById[result[i].id] = result[i];
             }
 
-            getUsers(function (error, result) {
-                if (error) return console.error('Unable to get user listing.', error);
-
-                angular.copy(result, $scope.users);
-                $scope.usersById = { };
-                for (var i = 0; i < result.length; i++) {
-                    $scope.usersById[result[i].id] = result[i];
-                }
-
-                $scope.ready = true;
-            });
+            refreshUsers();
         });
     }
 
+    $scope.showNextPage = function () {
+        $scope.currentPage++;
+        refreshUsers();
+    };
+
+    $scope.showPrevPage = function () {
+        if ($scope.currentPage > 1) $scope.currentPage--;
+        else $scope.currentPage = 1;
+        refreshUsers();
+    };
+
+    $scope.updateFilter = function (fresh) {
+        if (fresh) $scope.currentPage = 1;
+        refreshUsers();
+    };
+
     Client.onReady(refresh);
 
     // setup all the dialog focus handling