diff --git a/lib/public/user.php b/lib/public/user.php
index 6228268d75..327e2a7735 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -51,7 +51,7 @@ class User {
 	 *
 	 * Get a list of all users.
 	 */
-	public static function getUsers($search = '', $limit = -1, $offset = 0) {
+	public static function getUsers($search = '', $limit = null, $offset = null) {
 		return \OC_USER::getUsers();
 	}
 
diff --git a/lib/user/backend.php b/lib/user/backend.php
index 36e4bd9f76..0ef7ccd046 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -99,7 +99,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	*
 	* Get a list of all users.
 	*/
-	public function getUsers($search = '', $limit = -1, $offset = 0) {
+	public function getUsers($search = '', $limit = null, $offset = null) {
 		return array();
 	}
 
diff --git a/lib/user/dummy.php b/lib/user/dummy.php
index da3edfb2df..15a67b7e1e 100644
--- a/lib/user/dummy.php
+++ b/lib/user/dummy.php
@@ -100,7 +100,7 @@ class OC_User_Dummy extends OC_User_Backend {
 		*
 		* Get a list of all users.
 		*/
-	public function getUsers($search = '', $limit = -1, $offset = 0) {
+	public function getUsers($search = '', $limit = null, $offset = null) {
 		return array_keys($this->users);
 	}
 
diff --git a/lib/user/interface.php b/lib/user/interface.php
index a4903898fb..3d9f4691f2 100644
--- a/lib/user/interface.php
+++ b/lib/user/interface.php
@@ -48,7 +48,7 @@ interface OC_User_Interface {
 	*
 	* Get a list of all users.
 	*/
-	public function getUsers($search = '', $limit = -1, $offset = 0);
+	public function getUsers($search = '', $limit = null, $offset = null);
 
 	/**
 	* @brief check if a user exists