diff --git a/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js b/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
index fe2d7824d8..b262f651e2 100755
--- a/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
+++ b/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
@@ -248,7 +248,7 @@ module.controller('UserListCtrl', function($scope, realm, User, UserSearchState,
         UserSearchState.query.realm = realm.realm;
         $scope.query = UserSearchState.query;
         
-        $scope.searchQuery();
+        if (!UserSearchState.isFirstSearch) $scope.searchQuery();
     };
     
     $scope.impersonate = function(userId) {
@@ -293,6 +293,7 @@ module.controller('UserListCtrl', function($scope, realm, User, UserSearchState,
         $scope.users = User.query($scope.query, function() {
             $scope.searchLoaded = true;
             $scope.lastSearch = $scope.query.search;
+            UserSearchState.isFirstSearch = false;
         });
     };
 
diff --git a/themes/src/main/resources/theme/base/admin/resources/js/services.js b/themes/src/main/resources/theme/base/admin/resources/js/services.js
index cd69f87f3f..236ad44be4 100755
--- a/themes/src/main/resources/theme/base/admin/resources/js/services.js
+++ b/themes/src/main/resources/theme/base/admin/resources/js/services.js
@@ -347,6 +347,7 @@ module.factory('User', function($resource) {
 });
 
 module.service('UserSearchState', function() {
+    this.isFirstSearch = true;
     this.query = {
         max : 20,
         first : 0