diff --git a/multiple_users_autocomplete.info b/multiple_users_autocomplete.info
index 22ccdbb..9c52250 100644
--- a/multiple_users_autocomplete.info
+++ b/multiple_users_autocomplete.info
@@ -1,5 +1,5 @@
 ; $Id$
 name = Multiple Users Autocomplete
 description = Allows free tagging of users in a text field in the Forms API
-core = 6.x
+core = 7.x
 package = Users
diff --git a/multiple_users_autocomplete.module b/multiple_users_autocomplete.module
index 8e208e4..e7203ec 100644
--- a/multiple_users_autocomplete.module
+++ b/multiple_users_autocomplete.module
@@ -10,34 +10,29 @@ function multiple_users_autocomplete_menu(){
 	$items['user/autocomplete/multiple'] = array(
 		'title' => 'Multiple users autocomplete',
     	'page callback' => 'multiple_users_autocomplete_multiple',
-    	'access callback' => 'user_access',
     	'access arguments' => array('access user profiles'),
     	'type' => MENU_CALLBACK,
-	); 
-	
+	);
+
 	return $items;
 }
 
 
-/** 
- * Autocomplete for a form field of comma-separated usernames 
- */  
+/**
+ * Autocomplete for a form field of comma-separated usernames
+ */
 
 function multiple_users_autocomplete_multiple($string = '') {
-  
   $array = drupal_explode_tags($string);
-
   $last_string = trim(array_pop($array));
   $matches = array();
-  
   if ($last_string != '') {
-    $result = db_query_range(db_rewrite_sql("SELECT u.name FROM {users} u WHERE LOWER(u.name) LIKE LOWER('%%%s%%')",'u'), $last_string, 0, 10);
+    $result = db_select('users')->fields('users', array('name'))->condition('name', db_like($last_string) . '%', 'LIKE')->range(0, 10)->execute();
     $prefix = count($array) ? implode(', ', $array) .', ' : '';
-    while ($user = db_fetch_object($result)) {
+    while ($user = $result->fetchObject()) {
       $n = $user->name;
       $matches[$prefix . $n] = check_plain($user->name);
     }
   }
-
-  drupal_json($matches);
-}
\ No newline at end of file
+  drupal_json_output($matches);
+}