diff --git a/addressbook/inc/class.addressbook_export_contacts_csv.inc.php b/addressbook/inc/class.addressbook_export_contacts_csv.inc.php
index 58543cf341..807599ebe8 100644
--- a/addressbook/inc/class.addressbook_export_contacts_csv.inc.php
+++ b/addressbook/inc/class.addressbook_export_contacts_csv.inc.php
@@ -40,7 +40,7 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
 
 		// Addressbook defines its own export imits
 		$limit_exception = bo_merge::is_export_limit_excepted();
-		if($GLOBALS['egw_info']['server']['contact_export_limit'] == 'no' && !($GLOBALS['egw_info']['user']['apps']['admin'] || $limit_exception)) {
+		if($GLOBALS['egw_info']['server']['contact_export_limit'] == 'no' && !$limit_exception) {
 			return;
 		}
 
@@ -65,7 +65,7 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
 		}
 		$GLOBALS['egw_info']['flags']['currentapp'] = $old_app;
 
-		if($GLOBALS['egw_info']['server']['contact_export_limit'] && !($GLOBALS['egw_info']['user']['apps']['admin'] || $limit_exception)) {
+		if($GLOBALS['egw_info']['server']['contact_export_limit'] && !$limit_exception) {
 			$selection = array_slice($selection, 0, $GLOBALS['egw_info']['server']['contact_export_limit']);
 		}
 		if($options['explode_multiselects']) {
diff --git a/calendar/inc/class.calendar_export_csv.inc.php b/calendar/inc/class.calendar_export_csv.inc.php
index 630719f44a..20c3612dcc 100644
--- a/calendar/inc/class.calendar_export_csv.inc.php
+++ b/calendar/inc/class.calendar_export_csv.inc.php
@@ -44,7 +44,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
 				'users'         => $options['selection']['owner'],
 				'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 			);
-			if($config['export_limit'] && !($GLOBALS['egw_info']['user']['apps']['admin'] || $limit_exception)) {
+			if($config['export_limit'] && !$limit_exception) {
 				$query['offset'] = 0;
 				$query['num_rows'] = (int)$config['export_limit'];
 			}
@@ -57,7 +57,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
 				$query['start'] = 0;
 				$query['cfs'] = $cfs;
 
-				if($config['export_limit'] && !($GLOBALS['egw_info']['user']['apps']['admin'] || $limit_exception)) {
+				if($config['export_limit'] && !$limit_exception) {
 					$query['num_rows'] = (int)$config['export_limit'];
 				}
 				$ui = new calendar_uilist();
@@ -66,7 +66,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
 				$query = $GLOBALS['egw']->session->appsession('session_data','calendar');
 				$query['users'] = explode(',', $query['owner']);
 				$query['num_rows'] = -1;
-				if($config['export_limit'] && !($GLOBALS['egw_info']['user']['apps']['admin'] || $limit_exception)) {
+				if($config['export_limit'] && !$limit_exception) {
 					$query['num_rows'] = (int)$config['export_limit'];
 				}
 
diff --git a/calendar/inc/class.calendar_export_ical.inc.php b/calendar/inc/class.calendar_export_ical.inc.php
index 0051a6cb42..521148e9b8 100644
--- a/calendar/inc/class.calendar_export_ical.inc.php
+++ b/calendar/inc/class.calendar_export_ical.inc.php
@@ -44,7 +44,7 @@ class calendar_export_ical extends calendar_export_csv {
 				'users'         => $options['selection']['owner'],
 				'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 			);
-			if($config['export_limit'] && !($GLOBALS['egw_info']['user']['apps']['admin'] || $limit_exception)) {
+			if($config['export_limit'] && !$limit_exception) {
 				$query['offset'] = 0;
 				$query['num_rows'] = (int)$config['export_limit'];
 			}
@@ -57,7 +57,7 @@ class calendar_export_ical extends calendar_export_csv {
 				$query['start'] = 0;
 				$query['cfs'] = $cfs;
 
-				if($config['export_limit'] && !($GLOBALS['egw_info']['user']['apps']['admin'] || $limit_exception)) {
+				if($config['export_limit'] && !$limit_exception) {
 					$query['num_rows'] = (int)$config['export_limit'];
 				}
 				$ui = new calendar_uilist();
@@ -66,7 +66,7 @@ class calendar_export_ical extends calendar_export_csv {
 				$query = $GLOBALS['egw']->session->appsession('session_data','calendar');
 				$query['users'] = explode(',', $query['owner']);
 				$query['num_rows'] = -1;
-				if($config['export_limit'] && !($GLOBALS['egw_info']['user']['apps']['admin'] || $limit_exception)) {
+				if($config['export_limit'] && !$limit_exception) {
 					$query['num_rows'] = (int)$config['export_limit'];
 				}