diff --git a/lib/private/group/group.php b/lib/private/group/group.php
index a2b8a0dcbea7077391e6007fcb842380a8b88ae9..3efbb6e70231e9fbb4c10ae600305bea521ff199 100644
--- a/lib/private/group/group.php
+++ b/lib/private/group/group.php
@@ -172,12 +172,6 @@ class Group {
 		$users = array();
 		foreach ($this->backends as $backend) {
 			$userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
-			if (!is_null($limit)) {
-				$limit -= count($userIds);
-			}
-			if (!is_null($offset)) {
-				$offset -= count($userIds);
-			}
 			$users += $this->getVerifiedUsers($userIds);
 			if (!is_null($limit) and $limit <= 0) {
 				return array_values($users);
@@ -223,12 +217,6 @@ class Group {
 			} else {
 				$userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
 			}
-			if (!is_null($limit)) {
-				$limit -= count($userIds);
-			}
-			if (!is_null($offset)) {
-				$offset -= count($userIds);
-			}
 			$users = $this->getVerifiedUsers($userIds);
 			if (!is_null($limit) and $limit <= 0) {
 				return array_values($users);
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 9b433b64fd4825b5b8c0be777d7026a4e8d6b7f6..f591bd32aba71405cb4eea64a38b2f3d5bd70dee 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -134,12 +134,6 @@ class Manager extends PublicEmitter {
 		$groups = array();
 		foreach ($this->backends as $backend) {
 			$groupIds = $backend->getGroups($search, $limit, $offset);
-			if (!is_null($limit)) {
-				$limit -= count($groupIds);
-			}
-			if (!is_null($offset)) {
-				$offset -= count($groupIds);
-			}
 			foreach ($groupIds as $groupId) {
 				$groups[$groupId] = $this->getGroupObject($groupId);
 			}
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index a2ad9d17702cfc51caa9335a626da3add82cc73c..14698452e88f8f304dfc61fcb8110977ecc825d9 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -175,13 +175,6 @@ class Manager extends PublicEmitter {
 			if (is_array($backendUsers)) {
 				foreach ($backendUsers as $uid) {
 					$users[] = $this->getUserObject($uid, $backend);
-					if (!is_null($limit)) {
-						$limit--;
-					}
-					if (!is_null($offset) and $offset > 0) {
-						$offset--;
-					}
-
 				}
 			}
 		}
@@ -211,13 +204,6 @@ class Manager extends PublicEmitter {
 			if (is_array($backendUsers)) {
 				foreach ($backendUsers as $uid => $displayName) {
 					$users[] = $this->getUserObject($uid, $backend);
-					if (!is_null($limit)) {
-						$limit--;
-					}
-					if (!is_null($offset) and $offset > 0) {
-						$offset--;
-					}
-
 				}
 			}
 		}
diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php
index 147532f99479df89b450011bb6669b4ffe2248fd..990f8ecc1d5146f5a8b5624da260f0b31845cd25 100644
--- a/tests/lib/group/group.php
+++ b/tests/lib/group/group.php
@@ -287,7 +287,7 @@ class Group extends \PHPUnit_Framework_TestCase {
 			->will($this->returnValue(array('user2')));
 		$backend2->expects($this->once())
 			->method('usersInGroup')
-			->with('group1', 'user', 1, 0)
+			->with('group1', 'user', 2, 1)
 			->will($this->returnValue(array('user1')));
 
 		$users = $group->searchUsers('user', 2, 1);
diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php
index 90f0e1b35e2aaa7b1135ff4fe6e21d0cd3a86dd7..a03997c58eb2a2abad3aa0588883cdee31a115ef 100644
--- a/tests/lib/group/manager.php
+++ b/tests/lib/group/manager.php
@@ -254,7 +254,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
 		$backend2 = $this->getMock('\OC_Group_Database');
 		$backend2->expects($this->once())
 			->method('getGroups')
-			->with('1', 1, 0)
+			->with('1', 2, 1)
 			->will($this->returnValue(array('group12')));
 		$backend2->expects($this->any())
 			->method('groupExists')
diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php
index ad1ac9e12f2604a6201a0fb2269df177fcfacce0..8ca0f94c6fabc016904a268221d7d5d5a32fd095 100644
--- a/tests/lib/user/manager.php
+++ b/tests/lib/user/manager.php
@@ -210,7 +210,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
 		$backend2 = $this->getMock('\OC_User_Dummy');
 		$backend2->expects($this->once())
 			->method('getUsers')
-			->with($this->equalTo('fo'), $this->equalTo(1), $this->equalTo(0))
+			->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1))
 			->will($this->returnValue(array('foo3')));
 
 		$manager = new \OC\User\Manager();