diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index ba3b7ddfa..8479fb627 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -5,7 +5,9 @@ class UserController extends Zend_Controller_Action
 
     public function init()
     {
-        /* Initialize action controller here */
+    	$ajaxContext = $this->_helper->getHelper('AjaxContext');
+        $ajaxContext->addActionContext('get-hosts', 'json')
+                    ->initContext();
     }
 
     public function indexAction()
@@ -32,9 +34,10 @@ class UserController extends Zend_Controller_Action
 
     public function getHostsAction()
     {
-        $this->view->hosts = User::getHosts();
-    }
+		$search = $this->_getParam('term');
 
+        $this->view->hosts = User::getHosts($search);
+    }
 
 }
 
diff --git a/application/forms/AddShowWho.php b/application/forms/AddShowWho.php
index d46246f7a..55656c95f 100644
--- a/application/forms/AddShowWho.php
+++ b/application/forms/AddShowWho.php
@@ -15,7 +15,7 @@ class Application_Form_AddShowWho extends Zend_Form_SubForm
 		$hosts = User::getHosts();
 
 		foreach ($hosts as $host) {
-			$options[$host['id']] = $host['login'];
+			$options[$host['value']] = $host['label'];
 		}
 
 		//Add hosts selection
diff --git a/application/models/Users.php b/application/models/Users.php
index 0d25bbb16..bcc8c5a8b 100644
--- a/application/models/Users.php
+++ b/application/models/Users.php
@@ -39,39 +39,37 @@ class User {
 		
 	}
 
-	public static function getUsers($type=NULL, $search=NULL) {
+	public static function getUsers($type, $search=NULL) {
 		global $CC_DBC;
 
 		$sql;
 
-		$sql_gen = "SELECT id, login FROM cc_subjs ";
+		$sql_gen = "SELECT id AS value, login AS label FROM cc_subjs ";
 		$sql = $sql_gen;
+		
+		if(is_array($type)) {
+			for($i=0; $i<count($type); $i++) {
+				$type[$i] = "type = '{$type[$i]}'";
+			}
+			$sql_type = join(" OR ", $type);
+		}
+		else {
+			$sql_type = "type = {$type}";
+		}
+		
+		$sql = $sql_gen ." WHERE (". $sql_type.")";
 	
-		if(!is_null($type)){
-			
-			if(is_array($type)) {
-				for($i=0; $i<count($type); $i++) {
-					$type[$i] = "type = '{$type[$i]}'";
-				}
-				$sql_type = join(" OR ", $type);
-			}
-			else {
-				$sql_type = "type = {$type}";
-			}
-			
-			$sql = $sql_gen ." WHERE ". $sql_type;
-		}
 		if(!is_null($search)) {
-			$like = "login ILIKE '{$search}'";
-		}
+			$like = "login ILIKE '%{$search}%'";
 
-		$sql = $sql . " ORDER BY login";
+			$sql = $sql . " AND ".$like." ORDER BY login";
+		}
 	
 		return  $CC_DBC->GetAll($sql);	
 	}
 
-	public static function getHosts() {
-		return User::getUsers(array('H', 'A'));
+	public static function getHosts($search=NULL) {
+		return User::getUsers(array('H', 'A'), $search);
 	}
 
 }
diff --git a/public/js/airtime/schedule/add-show.js b/public/js/airtime/schedule/add-show.js
index 9e132427b..e242de66a 100644
--- a/public/js/airtime/schedule/add-show.js
+++ b/public/js/airtime/schedule/add-show.js
@@ -38,13 +38,22 @@ function createDateInput(el, onSelect) {
 
 function autoSelect(event, ui) {
 
-	$("#hosts-"+ui.item.value).attr("checked", "checked");
+	$("#add_show_hosts-"+ui.item.value).attr("checked", "checked");
 	event.preventDefault();
 }
 
 function findHosts(request, callback) {
-	var search = request.term;
+	var search, url;
 
+	url = "/User/get-hosts";
+	search = request.term;
+
+	$.post(url, 
+		{format: "json", term: search}, 
+		
+		function(json) {
+			callback(json.hosts);
+		});
 	
 }