diff --git a/services.module b/services.module
index cd9b7d1..9f4c786 100644
--- a/services.module
+++ b/services.module
@@ -259,6 +259,7 @@ function services_endpoint_save($endpoint) {
   if (is_array($endpoint) && isset($endpoint['build_info'])) {
     $endpoint = $endpoint['build_info']['args'][0];
   }
+
   ctools_export_crud_save('services_endpoint', $endpoint);
   ctools_export_load_object_reset('services_endpoint');
   menu_rebuild();
@@ -491,7 +492,7 @@ function services_resource_build_index_query($query, $page, $fields, $parameters
   }
   if (isset($parameters) && is_array($parameters)) {
     foreach ($parameters as $parameter => $parameter_value) {
-      $query->condition($parameter, $parameter_value, '=');
+      $query->condition($parameter, explode(',', $parameter_value), 'IN');
     }
   }
 }
diff --git a/tests/functional/ServicesResourceUserTests.test b/tests/functional/ServicesResourceUserTests.test
index 125a778..05244f7 100644
--- a/tests/functional/ServicesResourceUserTests.test
+++ b/tests/functional/ServicesResourceUserTests.test
@@ -280,6 +280,25 @@ class ServicesResourceUsertests extends ServicesWebtestCase {
 
     $this->assertTrue(empty($accounts_copy), t('Users were listed properly.'), 'UserResource: Index');
 
+    // Retrieve all the users using a list of uids.
+    $response = $this->servicesGet($this->endpoint->path . '/user', array('parameters' => array('uid' => implode(',', array_keys($accounts)))));
+
+    $response_accounts = $response['body'];
+
+    $accounts_copy = $accounts;
+
+    foreach ($response_accounts as $response_account) {
+      // If name and email are the same we believe that accounts are the same.
+      if (isset($accounts[$response_account->uid])) {
+        $saved_account = $accounts[$response_account->uid];
+        if ($response_account->name == $saved_account->name && $response_account->mail == $saved_account->mail) {
+          unset($accounts_copy[$response_account->uid]);
+        }
+      }
+    }
+
+    $this->assertTrue(empty($accounts_copy), t('Users were listed properly.'), 'UserResource: Index');
+
     $accounts_copy = $accounts;
     $account = array_pop($accounts_copy);