diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js
index fdddd07..ffd9355 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js
@@ -119,10 +119,13 @@ module.controller('UserRoleMappingCtrl', function($scope, $http, realm, user, ro
module.controller('UserListCtrl', function($scope, realm, User) {
$scope.realm = realm;
$scope.searchQuery = function() {
+ $scope.currentSearch = $scope.search;
$scope.searchLoaded = false;
- $scope.users = User.query({ realm: realm.id, search : $scope.search }, function() {
- $scope.searchLoaded = true;
- });
+ if ($scope.search) {
+ $scope.users = User.query({ realm: realm.id, search : $scope.search }, function() {
+ $scope.searchLoaded = true;
+ });
+ }
};
});
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html
index 942ea95..c79b243 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html
@@ -33,7 +33,7 @@
</th>
</tr>
<tr>
- <tr data-ng-show="users.length > 0">
+ <tr data-ng-show="searchLoaded && users.length > 0">
<th>Username</th>
<th>Last Name</th>
<th>First Name</th>
@@ -66,7 +66,7 @@
<div class="feedback warning inline" data-ng-show="searchLoaded && users.length == 0">
<p><strong>Your search returned no results.</strong><br>Try modifying the query and try again.</p>
</div>
- <div class="feedback info inline" data-ng-show="!search">
+ <div class="feedback info inline" data-ng-show="!currentSearch">
<br/>
<p><strong>Search for users.</strong><br>Please enter a search to display users.</p>
</div>
