diff --git a/src/theme.scss b/src/theme.scss
index 0f88bc03c..40c319eac 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -1441,18 +1441,6 @@ footer {
     overflow: hidden;
 }
 
-.users-filter {
-    display: inline-block;
-    padding-left: 0;
-    margin: 20px 0;
-    border-radius: 2px;
-
-    .form-control {
-        display: inline-block;
-        width: 200px;
-    }
-}
-
 // ----------------------------
 // Upgrade
 // ----------------------------
diff --git a/src/views/users.html b/src/views/users.html
index 61ede7177..42ec9b430 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -550,22 +550,10 @@
       <button class="btn btn-primary btn-outline pull-right" ng-click="useradd.show()">
         <i class="fa fa-user-plus"></i> {{ 'users.newUserAction' | tr }}
       </button>
+      <input type="text" class="form-control pull-right" style="max-width: 350px;" ng-model="userSearchString" ng-model-options="{ debounce: 1000 }" ng-change="updateFilter()" placeholder="{{ 'main.searchPlaceholder' | tr }}"/>
     </h1>
   </div>
 
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="users-filter">
-        <input type="text" class="form-control" style="min-width: 350px;" ng-model="userSearchString" ng-model-options="{ debounce: 1000 }" ng-change="updateFilter()" placeholder="{{ 'main.searchPlaceholder' | tr }}"/>
-        <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> {{ 'main.pagination.prev' | tr }}</button>
-        <button class="btn btn-default btn-outline" ng-click="showNextPage()" ng-disabled="userRefreshBusy || users.length < pageItems.value">{{ 'main.pagination.next' | tr }} <i class="fa fa-angle-double-right"></i></button>
-      </div>
-    </div>
-  </div>
-
   <div>
     <div class="card card-large">
       <div class="grid-item-top">
@@ -590,7 +578,7 @@
                   <td colspan="5" class="text-center text-muted">{{ 'users.users.empty' | tr }}</td>
                 </tr>
                 <tr ng-repeat="user in users" ng-class="{'text-muted': !user.active}">
-                  <td>
+                  <td style="min-width: 33.5px;">
                     <i class="fas fa-crown arrow" ng-show="user.active && user.role === 'owner'" uib-tooltip="{{ 'users.users.superadminTooltip' | tr }}"></i>
                     <i class="fa fa-user-tie arrow" ng-show="user.active && user.role === 'admin'" uib-tooltip="{{ 'users.users.adminTooltip' | tr }}"></i>
                     <i class="fas fa-users-cog arrow" ng-show="user.active && user.role === 'usermanager'" uib-tooltip="{{ 'users.users.usermanagerTooltip' | tr }}"></i>
@@ -620,6 +608,11 @@
                 </tr>
               </tbody>
             </table>
+            <br/>
+            <div class="pull-right">
+              <button class="btn btn-default btn-outline btn-xs" ng-click="showPrevPage()" ng-class="{ 'btn-primary': currentPage > 1 }" ng-disabled="userRefreshBusy || currentPage <= 1"><i class="fa fa-angle-double-left"></i> {{ 'main.pagination.prev' | tr }}</button>
+              <button class="btn btn-default btn-outline btn-xs" ng-click="showNextPage()" ng-class="{ 'btn-primary': users.length > pageItems }" ng-disabled="userRefreshBusy || users.length < pageItems">{{ 'main.pagination.next' | tr }} <i class="fa fa-angle-double-right"></i></button>
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/views/users.js b/src/views/users.js
index 867fbde99..bc4930dee 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -39,12 +39,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
     $scope.userSearchString = '';
     $scope.currentPage = 1;
-    $scope.pageItemCount = [
-        { name: $translate.instant('main.pagination.perPageSelector', { n: 20 }), value: 20 },
-        { name: $translate.instant('main.pagination.perPageSelector', { n: 50 }), value: 50 },
-        { name: $translate.instant('main.pagination.perPageSelector', { n: 100 }), value: 100 }
-    ];
-    $scope.pageItems = $scope.pageItemCount[0];
+    $scope.pageItems = 15;
     $scope.userRefreshBusy = true;
 
     $scope.groupMembers = function (group) {
@@ -887,10 +882,10 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     function getUsers(callback) {
         var users = [];
 
-        Client.getUsers($scope.userSearchString, $scope.currentPage, $scope.pageItems.value, function (error, results) {
+        Client.getUsers($scope.userSearchString, $scope.currentPage, $scope.pageItems, function (error, results) {
             if (error) return console.error(error);
 
-            async.eachOfLimit(results, 20, function (result, index, iteratorDone) {
+            async.eachOf(results, function (result, index, iteratorDone) {
                 Client.getUser(result.id, function (error, user) {
                     if (error) return iteratorDone(error);
 
@@ -951,8 +946,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         refreshUsers();
     };
 
-    $scope.updateFilter = function (fresh) {
-        if (fresh) $scope.currentPage = 1;
+    $scope.updateFilter = function () {
         refreshUsers();
     };