diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js
index 7906579950..c589ee4b34 100644
--- a/public/src/forum/admin/users.js
+++ b/public/src/forum/admin/users.js
@@ -3,6 +3,7 @@
 	jQuery('document').ready(function() {
 
 		var yourid = templates.get('yourid');
+		var timeoutId = 0;
 
 		var url = window.location.href,
 			parts = url.split('/'),
@@ -17,14 +18,17 @@
 		});
 
 		jQuery('#search-user').on('keyup', function () {
-			console.log('derp'); 
-			jQuery('.icon-spinner').removeClass('none');
-			console.log($('#search-user').val());
-			socket.emit('api:admin.user.search', $('#search-user').val());
-		});
-
+			if(timeoutId !== 0) {
+				clearTimeout(timeoutId);
+				timeoutId = 0;
+			}
 
 
+			timeoutId = setTimeout(function() {
+				jQuery('.icon-spinner').removeClass('none');
+				socket.emit('api:admin.user.search', $('#search-user').val());
+			}, 250);
+		});
 		
 
 		function isUserAdmin(element) {
diff --git a/public/templates/admin/index.tpl b/public/templates/admin/index.tpl
index 7d1d74fce0..843a155ede 100644
--- a/public/templates/admin/index.tpl
+++ b/public/templates/admin/index.tpl
@@ -43,7 +43,26 @@
 	socket.emit('api:get_all_rooms');
 
 	socket.on('api:admin.user.search', function(data) {
-		console.log(data);
+		var	html = templates.prepare(templates['admin/users'].blocks['users']).parse({
+				users: data
+			}),
+			userListEl = document.querySelector('.users');
+
+		userListEl.innerHTML = html;
+		jQuery('.icon-spinner').addClass('none');				
+
+		if(data && data.length === 0) {
+			$('#user-notfound-notify').html('User not found!')
+				.show()
+				.addClass('label-important')
+				.removeClass('label-success');
+		}
+		else
+			$('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!')
+				.show()
+				.addClass('label-success')
+				.removeClass('label-important');
+
 	});
 
 </script>
\ No newline at end of file
diff --git a/public/templates/admin/users.tpl b/public/templates/admin/users.tpl
index bac6328897..1f9bc8af8a 100644
--- a/public/templates/admin/users.tpl
+++ b/public/templates/admin/users.tpl
@@ -11,33 +11,36 @@
 <div class="search {search_display} well">
 	<input id="search-user" type="text" placeholder="Enter a username to search"/><br />
 	<i class="icon-spinner icon-spin none"></i>
+	<span id="user-notfound-notify" class="label label-important hide">User not found!</span><br/>
 </div>
 
-<!-- BEGIN users -->
-<div class="users-box well" data-uid="{users.uid}" data-admin="{users.administrator}" data-username="{users.username}">
-	<a href="/users/{users.userslug}">
-		<img src="{users.picture}" class="user-8080-picture"/>
-	</a>
-	<br/>
-	<a href="/users/{users.userslug}">{users.username}</a>
-	<br/>
-	<div title="reputation">
-		<span id='reputation'>{users.reputation}</span>
-		<i class='icon-star'></i>
+<ul class="users">
+	<!-- BEGIN users -->
+	<div class="users-box well" data-uid="{users.uid}" data-admin="{users.administrator}" data-username="{users.username}">
+		<a href="/users/{users.userslug}">
+			<img src="{users.picture}" class="user-8080-picture"/>
+		</a>
+		<br/>
+		<a href="/users/{users.userslug}">{users.username}</a>
+		<br/>
+		<div title="reputation">
+			<span id='reputation'>{users.reputation}</span>
+			<i class='icon-star'></i>
+		</div>
+		<div title="post count">
+			<span id='postcount'>{users.postcount}</span>
+			<i class='icon-pencil'></i>
+		</div>
+		<div>
+			<a href="#" class="btn admin-btn">Admin</a>
+		</div>
+		<br/>
+		<div>
+			<a href="#" class="btn delete-btn btn-danger">Delete</a>
+		</div>
 	</div>
-	<div title="post count">
-		<span id='postcount'>{users.postcount}</span>
-		<i class='icon-pencil'></i>
-	</div>
-	<div>
-		<a href="#" class="btn admin-btn">Admin</a>
-	</div>
-	<br/>
-	<div>
-		<a href="#" class="btn delete-btn btn-danger">Delete</a>
-	</div>
-</div>
-<!-- END users -->
+	<!-- END users -->
+</ul>
 
 <input type="hidden" template-variable="yourid" value="{yourid}" />
 
diff --git a/src/user.js b/src/user.js
index 2d26c535cd..9f095c6af2 100644
--- a/src/user.js
+++ b/src/user.js
@@ -255,22 +255,17 @@ var utils = require('./../public/src/utils.js'),
 
 	User.search = function(username, callback) {
 		console.log('searching '+username);
-		RDB.keys('username:'+ username + '*:uid', function(err, keys) {
+		RDB.keys('username:*'+ username + '*:uid', function(err, keys) {
 			if(err === null) {
-				//console.log(data);
-				
-				/*var keys = [];
-				for(var i=0, ii=data.length; i<ii; ++i) {
-					keys.push('')
-				}*/
-
-				RDB.mget(keys, function(err, uids) {
-					console.log(uids);
-					User.getDataForUsers(uids, function(userdata) {
-						callback(userdata);
-					});
-				});
-			
+				if(keys && keys.length) {
+					RDB.mget(keys, function(err, uids) {
+						User.getDataForUsers(uids, function(userdata) {
+							callback(userdata);
+						});
+					});			
+				}
+				else
+					callback([]);
 			}	
 			else
 				console.log(err);
@@ -378,7 +373,7 @@ var utils = require('./../public/src/utils.js'),
 	User.getDataForUsers = function(userIds, callback) {
 		var returnData = [];
 
-		if(userIds.length === 0) {
+		if(!userIds || userIds.length === 0) {
 			callback(returnData);
 			return;
 		}