diff --git a/plugins/access/domain.inc b/plugins/access/domain.inc
index 3f21b4e..7ff0c7f 100644
--- a/plugins/access/domain.inc
+++ b/plugins/access/domain.inc
@@ -24,55 +24,15 @@ function domain_ctools_domain_ctools_access() {
  * Settings form domain access plugin.
  */
 function domain_ctools_domain_access_settings(&$form, &$form_state, $conf) {
-  $domains = domain_domains();
-  $options = array();
-  $format = domain_select_format();
-  foreach ($domains as $domain) {
-    // Checkboxes cannot handles zeros.
-    if ($domain['domain_id'] == 0) {
-      $domain['domain_id'] = -1;
-    }
-    // The domain must be valid.
-    if ($domain['valid'] || user_access('access inactive domains')) {
-      // Filter checkboxes but not select lists.
-      $options[$domain['domain_id']] = empty($format) ? check_plain($domain['sitename']) : $domain['sitename'];
-    }
-  }
-  $form['settings']['domain_site'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Show on all affiliates'),
-    '#default_value' => isset($conf['domain_site']) ? $conf['domain_site'] : TRUE,
-    '#description' => t('Show content on all domains. This setting will override the domain-specific options below.'),
-  );
-  $form['settings']['domains'] = array(
-    '#type' => empty($format) ? 'checkboxes' : 'select',
-    '#title' => t('Domains'),
-    '#default_value' => isset($conf['domains']) ? $conf['domains'] : array(),
-    '#options' => $options,
-    '#description' => t('This content will only be visible on the selected domains.'),
-  );
-  if ($format) {
-    $form['settings']['domains']['#multiple'] = TRUE;
-    $form['settings']['domains']['#size'] = count($options) > 10 ? 10 : count($options);
-  }
+  module_load_include('inc', 'domain', 'domain.admin');
+  $form['settings'] += _domain_access_form($conf);
 }
 
 /**
  * Check for access based on the currently active domain.
  */
 function domain_ctools_domain_access_check($conf, $context) {
-  global $_domain;
-  if ($conf['domain_site']) {
-    return TRUE;
-  }
-  // Check each domain, converting -1 to 0.
-  foreach ($conf['domains'] as $key => $value) {
-    $id = ($key == -1) ? 0 : $key;
-    if (abs($value) > 0 && $id == $_domain['domain_id']) {
-      return TRUE;
-    }
-  }
-  return FALSE;
+    return domain_access(array_filter($conf['domains']), $conf['domain_strict'], $conf['domain_member'], $conf['domain_site']);
 }
 
 /**
@@ -99,6 +59,10 @@ function domain_ctools_domain_acesss_summary($conf, $context) {
     else {
       $output = t('Visible on !domains.', array('!domains' => implode(', ', $names)));
     }
+    if ($conf['domain_member']) {
+      $output .= t(" Only users who are assigned to the current domain.");
+    }
   }
+    
   return $output;
 }
