diff --git a/dashboard/src/views/domains.js b/dashboard/src/views/domains.js
index 395ac8e0c..718c132fc 100644
--- a/dashboard/src/views/domains.js
+++ b/dashboard/src/views/domains.js
@@ -11,7 +11,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
     $scope.domains = [];
     $scope.ready = false;
     $scope.domainSearchString = '';
-    $scope.pageSize = 10;
+    $scope.pageSize = localStorage.cloudronPageSize || 10;
     $scope.currentPage = 1;
 
     $scope.showNextPage = function () {
diff --git a/dashboard/src/views/users.html b/dashboard/src/views/users.html
index 9cb5237fe..a3056c55b 100644
--- a/dashboard/src/views/users.html
+++ b/dashboard/src/views/users.html
@@ -672,6 +672,7 @@
             </div>
             <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>
+                <span style="margin: 0 5px; line-height: 1.5; font-size: 12px;">{{ currentPage }}</span>
               <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>
diff --git a/dashboard/src/views/users.js b/dashboard/src/views/users.js
index 20649fd27..ff83b5b5f 100644
--- a/dashboard/src/views/users.js
+++ b/dashboard/src/views/users.js
@@ -42,7 +42,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
     $scope.userSearchString = '';
     $scope.currentPage = 1;
-    $scope.pageItems = 15;
+    $scope.pageItems = localStorage.cloudronPageSize || 15;
     $scope.userRefreshBusy = true;
 
     $scope.userStates = [