diff --git a/ipa-server/ipa-gui/ipagui/static/css/style.css b/ipa-server/ipa-gui/ipagui/static/css/style.css
index 80fdba855..28f501352 100644
--- a/ipa-server/ipa-gui/ipagui/static/css/style.css
+++ b/ipa-server/ipa-gui/ipagui/static/css/style.css
@@ -379,3 +379,7 @@ ul.checkboxlist li input {
   width:			1.2em;
   border:			1px solid red;
 }
+
+#inactive {
+  background-color:            silver;
+}
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py
index 570ca2a42..1ff860552 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py
@@ -465,7 +465,7 @@ class UserController(IPAController):
         uid = kw.get('uid')
         if uid != None and len(uid) > 0:
             try:
-                users = client.find_users(uid.encode('utf-8'), None, 0, 2)
+                users = client.find_users(uid.encode('utf-8'), user_fields, 0, 2)
                 counter = users[0]
                 users = users[1:]
                 if counter == -1:
diff --git a/ipa-server/ipa-gui/ipagui/templates/userlist.kid b/ipa-server/ipa-gui/ipagui/templates/userlist.kid
index 0c037d2ac..fdeeb3169 100644
--- a/ipa-server/ipa-gui/ipagui/templates/userlist.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/userlist.kid
@@ -19,7 +19,7 @@
     </div>
     <div py:if='(users != None) and (len(users) > 0)'>
         <h2>${len(users)} results returned:</h2>
-        <table id="resultstable" class="details sortable resizable">
+        <table id="resultstable" class="details sortable resizable" cellspacing="0">
           <thead>
             <tr>
                 <th>
@@ -37,7 +37,25 @@
             </tr>
           </thead>
           <tbody>
-            <tr py:for="user in users">
+            <tr py:for="user in users" py:if="user.nsAccountLock != 'true'">
+                <td>
+                    <a href="${tg.url('/user/show',uid=user.uid)}"
+                    >${user.givenName} ${user.sn}</a>
+                    (${user.uid})
+                </td>
+                <td>
+                    ${user.telephoneNumber}
+                </td>
+                <td>
+                    ${user.ou}
+                </td>
+                <td>
+                    ${user.title}
+                </td>
+            </tr>
+          </tbody>
+          <tbody>
+            <tr id="inactive" py:for="user in users" py:if="user.nsAccountLock == 'true'">
                 <td>
                     <a href="${tg.url('/user/show',uid=user.uid)}"
                     >${user.givenName} ${user.sn}</a>