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 de73f6333a..f2c6b7c1fc 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
@@ -120,15 +120,16 @@ module.controller('UserListCtrl', function($scope, realm, User) {
     $scope.realm = realm;
     $scope.searchQuery = function() {
         $scope.searchLoaded = false;
+        $scope.currentSearch = $scope.search;
+
+        var params = { realm: realm.id };
         if ($scope.search) {
-            $scope.currentSearch = $scope.search;
-            $scope.users = User.query({ realm: realm.id, search : $scope.search }, function() {
-                $scope.searchLoaded = true;
-            });
-        } else {
-            $scope.currentSearch = null;
-            $scope.users = null;
+            params.search = $scope.search;
         }
+
+        $scope.users = User.query(params, function() {
+            $scope.searchLoaded = true;
+        });
     };
 });
 
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html
index 16a16972e1..a3b193671a 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html
@@ -21,7 +21,7 @@
                     <tr>
                         <th class="rcue-table-actions" colspan="3">
                             <div class="search-comp clearfix">
-                                <input type="text" placeholder="Search..." class="search"
+                                <input type="text" placeholder="Search..." class="search" data-ng-model="search.name"
                                        onkeyup="if(event.keyCode == 13){$(this).next('button').click();}">
                                 <button class="icon-search" tooltip-placement="right"
                                         tooltip="Search by application name.">
@@ -52,7 +52,7 @@
                     </tr>
                     </tfoot>
                     <tbody>
-                    <tr ng-repeat="app in applications">
+                    <tr ng-repeat="app in applications | filter:search">
                         <td><a href="#/realms/{{realm.id}}/applications/{{app.id}}">{{app.name}}</a></td>
                         <td>{{app.enabled}}</td>
                         <td ng-class="{'text-muted': !app.baseUrl}">{{app.baseUrl || "Not defined"}}</td>
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 c79b243125..96cee2177c 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
@@ -14,7 +14,7 @@
                 </ol>
                 <h2><span>{{realm.realm}}</span> Users</h2>
                 <table>
-                    <caption data-ng-show="users && search" class="hidden">Table of realm users</caption>
+                    <caption data-ng-show="users" class="hidden">Table of realm users</caption>
                     <thead>
                         <tr>
                             <th class="rcue-table-actions" colspan="4">
@@ -28,6 +28,7 @@
                                     </button>
                                 </div>
                                 <div class="actions">
+                                    <button ng-click="search = null; searchQuery()">View all</button>
                                     <a class="button" href="#/create/user/{{realm.id}}">Add User</a>
                                 </div>
                             </th>
@@ -66,7 +67,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="!currentSearch">
+                <div class="feedback info inline" data-ng-show="!users">
                     <br/>
                     <p><strong>Search for users.</strong><br>Please enter a search to display users.</p>
                 </div>
diff --git a/model/api/src/main/java/org/keycloak/models/RealmModel.java b/model/api/src/main/java/org/keycloak/models/RealmModel.java
index a4527ae1aa..ce76dcb45a 100755
--- a/model/api/src/main/java/org/keycloak/models/RealmModel.java
+++ b/model/api/src/main/java/org/keycloak/models/RealmModel.java
@@ -137,6 +137,8 @@ public interface RealmModel extends RoleContainerModel, RoleMapperModel, ScopeMa
 
     public void setAutomaticRegistrationAfterSocialLogin(boolean automaticRegistrationAfterSocialLogin);
 
+    List<UserModel> getUsers();
+
     List<UserModel> searchForUser(String search);
 
     List<UserModel> searchForUserByAttributes(Map<String, String> attributes);
diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java
index 6e6c8f1186..201f286dca 100755
--- a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java
+++ b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java
@@ -670,9 +670,19 @@ public class RealmAdapter implements RealmModel {
         em.flush();
     }
 
+    @Override
+    public List<UserModel> getUsers() {
+        TypedQuery<UserEntity> query = em.createQuery("select u from UserEntity u where u.realm = :realm", UserEntity.class);
+        query.setParameter("realm", realm);
+        List<UserEntity> results = query.getResultList();
+        List<UserModel> users = new ArrayList<UserModel>();
+        for (UserEntity entity : results) users.add(new UserAdapter(entity));
+        return users;
+    }
+
     @Override
     public List<UserModel> searchForUser(String search) {
-        TypedQuery<UserEntity> query = em.createQuery("select u from UserEntity u where u.realm = :realm and lower(u.loginName) like :search or lower(concat(u.firstName, ' ', u.lastName)) like :search or u.email like :search", UserEntity.class);
+        TypedQuery<UserEntity> query = em.createQuery("select u from UserEntity u where u.realm = :realm and ( lower(u.loginName) like :search or lower(concat(u.firstName, ' ', u.lastName)) like :search or u.email like :search )", UserEntity.class);
         query.setParameter("realm", realm);
         query.setParameter("search", "%" + search.toLowerCase() + "%");
         List<UserEntity> results = query.getResultList();
diff --git a/model/picketlink/src/main/java/org/keycloak/models/picketlink/RealmAdapter.java b/model/picketlink/src/main/java/org/keycloak/models/picketlink/RealmAdapter.java
index 798643e815..fb2dca68f1 100755
--- a/model/picketlink/src/main/java/org/keycloak/models/picketlink/RealmAdapter.java
+++ b/model/picketlink/src/main/java/org/keycloak/models/picketlink/RealmAdapter.java
@@ -914,23 +914,28 @@ public class RealmAdapter implements RealmModel {
         getRelationshipManager().remove(relationship);
     }
 
+    @Override
+    public List<UserModel> getUsers() {
+        List<UserModel> userModels = new ArrayList<UserModel>();
+        IdentityQuery<User> query = getIdm().createIdentityQuery(User.class);
+        for (User u : query.getResultList()) {
+            userModels.add(new UserAdapter(u, idm));
+        }
+        return userModels;
+    }
+
     @Override
     public List<UserModel> searchForUser(String search) {
         QueryParameter[] params = new QueryParameter[] { User.LOGIN_NAME, User.FIRST_NAME, User.LAST_NAME, User.EMAIL };
 
-        Map<String, User> users = new HashMap<String, User>();
+        List<UserModel> userModels = new ArrayList<UserModel>();
         for (QueryParameter p : params) {
             IdentityQuery<User> query = getIdm().createIdentityQuery(User.class);
             query.setParameter(p, search.toLowerCase());
             for (User u : query.getResultList()) {
-                users.put(u.getLoginName(), u);
+                userModels.add(new UserAdapter(u, idm));
             }
         }
-
-        List<UserModel> userModels = new ArrayList<UserModel>();
-        for (User user : users.values()) {
-            userModels.add(new UserAdapter(user, idm));
-        }
         return userModels;
     }
 
diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
index 61e70bf682..e8e34c76e1 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
@@ -135,14 +135,10 @@ public class UsersResource {
                                              @QueryParam("username") String username) {
         RealmManager manager = new RealmManager(session);
         List<UserRepresentation> results = new ArrayList<UserRepresentation>();
+        List<UserModel> userModels;
         if (search != null) {
-            List<UserModel> userModels = manager.searchUsers(search, realm);
-            for (UserModel user : userModels) {
-                if (isUser(user)) {
-                    results.add(manager.toRepresentation(user));
-                }
-            }
-        } else {
+            userModels = manager.searchUsers(search, realm);
+        } else if (last != null || first != null || email != null || username != null) {
             Map<String, String> attributes = new HashMap<String, String>();
             if (last != null) {
                 attributes.put(UserModel.LAST_NAME, last);
@@ -156,11 +152,18 @@ public class UsersResource {
             if (username != null) {
                 attributes.put(UserModel.LOGIN_NAME, username);
             }
-            List<UserModel> userModels = realm.searchForUserByAttributes(attributes);
+            userModels = realm.searchForUserByAttributes(attributes);
             for (UserModel user : userModels) {
                 results.add(manager.toRepresentation(user));
             }
+        } else {
+            userModels = realm.getUsers();
+        }
 
+        for (UserModel user : userModels) {
+            if (isUser(user)) {
+                results.add(manager.toRepresentation(user));
+            }
         }
         return results;
     }
diff --git a/services/src/test/java/org/keycloak/test/AdapterTest.java b/services/src/test/java/org/keycloak/test/AdapterTest.java
index a600f6f67e..0bcfbc5bdb 100755
--- a/services/src/test/java/org/keycloak/test/AdapterTest.java
+++ b/services/src/test/java/org/keycloak/test/AdapterTest.java
@@ -303,7 +303,6 @@ public class AdapterTest extends AbstractKeycloakTest {
         }
 
         RealmManager adapter = getRealmManager();
-        adapter.createRealm("other").addUser("bburke");
 
         {
             List<UserModel> userModels = adapter.searchUsers("total junk query", realmModel);
@@ -438,8 +437,11 @@ public class AdapterTest extends AbstractKeycloakTest {
             }
         }
 
+        RealmModel otherRealm = adapter.createRealm("other");
+        otherRealm.addUser("bburke");
 
-
+        Assert.assertEquals(1, otherRealm.getUsers().size());
+        Assert.assertEquals(1, otherRealm.searchForUser("u").size());
     }