diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php
index cc32ad8a45..2586cbfeeb 100644
--- a/calendar/inc/class.calendar_hooks.inc.php
+++ b/calendar/inc/class.calendar_hooks.inc.php
@@ -194,9 +194,8 @@ class calendar_hooks
 			'selected' => lang('Selected users/groups')
 		);
 		$defaultresource_sel = array(
-			'resources_conflict'    => lang('resources with conflict detection'),
-			'resources_without_conflict'    => lang('resources except conflicting ones'),
-			'resources'     => lang('resources')
+			'resources_conflict'    => lang('resources'),
+			'resources_without_conflict'    => lang('resources except conflicting ones')
 		);
 		$reset_stati_on_shifts = array(
 			'no'		=> lang('Never'),
diff --git a/resources/inc/class.resources_bo.inc.php b/resources/inc/class.resources_bo.inc.php
index 84f77c3d43..f26eca7c54 100755
--- a/resources/inc/class.resources_bo.inc.php
+++ b/resources/inc/class.resources_bo.inc.php
@@ -725,9 +725,9 @@ class resources_bo
 		}
 		$list = array();
 		$data = $this->so->search($criteria,$only_keys,$order_by='name',$extra_cols='',$wildcard='%',$empty,$op='OR',$limit,$filter);
-		// maybe we need to check disponibility of the searched resources in the calendar if $pattern ['exec'] contains some extra args
+		// we need to check availability of the searched resources in the calendar if $pattern ['exec'] contains some extra args
 		$show_conflict=False;
-		if ($data && $options['exec'] && $GLOBALS['egw_info']['preferences']['calendar']['defaultresource_sel'] !== 'resources')
+		if ($data && $options['exec'])
 		{
 			// we'll use a cache for resources info taken from database
 			static $res_info_cache = array();