diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl
index 5dda16f772..e9bf71ade6 100644
--- a/admin/templates/default/config.tpl
+++ b/admin/templates/default/config.tpl
@@ -25,7 +25,7 @@
     <td>{lang_Timeout_for_application_session_data_in_seconds_(default_86400_=_1_day)}:</td>
     <td><input size="8" name="newsettings[sessions_app_timeout]" value="{value_sessions_app_timeout}"></td>
    </tr>
-   
+
    <tr class="row_on">
     <td>{lang_Would_you_like_to_show_each_application's_upgrade_status_?}:</td><td>
      <select name="newsettings[checkappversions]">
@@ -294,12 +294,15 @@
     <td>{lang_How_many_entries_should_non-admins_be_able_to_export_(empty_=_no_limit,_no_=_no_export)}:<br />{lang_This_controls_exports_and_merging.}</td>
     <td><input name="newsettings[export_limit]" value="{value_export_limit}" size="5"></td>
    </tr>
-   </tr>
    <tr class="row_on">
+    <td>{lang_Group_excepted_from_above_export_limit_(admins_are_always_excepted)}:</td>
+    <td>{call_bo_merge::hook_export_limit_excepted}</td>
+   </tr>
+   <tr class="row_off">
     <td>{lang_Allow_remote_administration_from_following_install_ID's_(comma_separated)}:<br />{lang_Own_install_ID:_}{value_install_id}</td>
     <td><input name="newsettings[allow_remote_admin]" value="{value_allow_remote_admin}" size="40"></td>
    </tr>
-   <tr class="row_off">
+   <tr class="row_on">
     <td>{lang_Should_exceptions_contain_a_trace_(including_function_arguments)}:</td>
     <td>
       <select name="newsettings[exception_show_trace]">
diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index 5a01b43c42..82fb7884df 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -76,6 +76,19 @@ abstract class bo_merge
 		$this->export_limit = $GLOBALS['egw_info']['server']['export_limit'];
 	}
 
+	/**
+	 * Hook returning options for export_limit_excepted groups
+	 *
+	 * @param array $config
+	 */
+	public static function hook_export_limit_excepted($config)
+	{
+		error_log(__METHOD__.'('.array2string($config).')');
+		$accountsel = new uiaccountsel();
+
+		return $accountsel->selection('newsettings[export_limit_excepted]','export_limit_excepted',$config['export_limit_excepted'],'both',4);
+	}
+
 	/**
 	 * Get all replacements, must be implemented in extending class
 	 *
@@ -322,7 +335,7 @@ abstract class bo_merge
 		}
 		return $content;
 	}
-	
+
 	protected function apply_styles (&$content, $mimetype) {
 		// Tags we can replace with the target document's version
 		$replace_tags = array();
@@ -336,7 +349,7 @@ abstract class bo_merge
 					'/<\/(ol|ul|table)>/' => '</$1><text:p>',
 					//'/<(li)(.*?)>(.*?)<\/\1>/' => '<$1 $2>$3</$1>',
 				);
-				$content = preg_replace(array_keys($replace_tags),array_values($replace_tags),$content); 
+				$content = preg_replace(array_keys($replace_tags),array_values($replace_tags),$content);
 
 				$doc = new DOMDocument();
 				$xslt = new XSLTProcessor();
@@ -356,7 +369,7 @@ abstract class bo_merge
 					'/<\/(ol|ul|table)>/' => '</$1><w:p><w:r><w:t>',
 					'/<(li)(.*?)>(.*?)<\/\1>/' => '<$1 $2>$3</$1>',
 				);
-				$content = preg_replace(array_keys($replace_tags),array_values($replace_tags),$content); 
+				$content = preg_replace(array_keys($replace_tags),array_values($replace_tags),$content);
 //echo $content;die();
 				$doc = new DOMDocument();
 				$xslt = new XSLTProcessor();