diff --git a/domain_content/domain_content.admin.inc b/domain_content/domain_content.admin.inc
index 32abd7c..a21f4fa 100644
--- a/domain_content/domain_content.admin.inc
+++ b/domain_content/domain_content.admin.inc
@@ -39,12 +39,8 @@ function domain_content_page() {
  */
 function domain_content_list() {
   global $user;
-  $build = array();
-  if (user_access('administer nodes') || user_access('review content for all domains')) {
-    // Return all domains.
-    $query = "SELECT domain_id, subdomain, sitename, scheme FROM {domain} d";
-  }
-  else {
+  $show_all = user_access('bypass node access') || user_access('review content for all domains');
+  if (!$show_all) {
     if (empty($user->domain_user)) {
       return drupal_access_denied();
     }
@@ -54,6 +50,7 @@ function domain_content_list() {
       $user->domain_user[0] = 0;
     }
   }
+
   // Table information
   $header = array(
     array('data' => t('Id'), 'field' => 'domain_id'),
@@ -74,18 +71,22 @@ function domain_content_list() {
   foreach ($result as $data) {
     $domains[] = (array) $data;
   }
+
   // Create the table.
   $rows = array();
   foreach ($domains as $domain) {
-    $path = trim(domain_get_path($domain), '/');
-    $rows[] = array(
-      $domain['domain_id'],
-      l(t('@sitename content', array('@sitename' => $domain['sitename'])), 'admin/domain/content/'. $domain['domain_id']),
-      (int) db_query("SELECT COUNT(nid) FROM {domain_access} WHERE gid = :gid AND realm = :realm", array(':gid' => $domain['domain_id'], ':realm' => 'domain_id'))->fetchField(),
-      l(t('view site'), $path),
-    );
+    if ($show_all || !empty($user->domain_user[$domain['domain_id']])) {
+      $path = trim(domain_get_path($domain), '/');
+      $rows[] = array(
+        $domain['domain_id'],
+        l(t('@sitename content', array('@sitename' => $domain['sitename'])), 'admin/domain/content/'. $domain['domain_id']),
+        (int) db_query("SELECT COUNT(nid) FROM {domain_access} WHERE gid = :gid AND realm = :realm", array(':gid' => $domain['domain_id'], ':realm' => 'domain_id'))->fetchField(),
+        l(t('view site'), $path),
+      );
+    }
   }
 
+  // Add entry for 'all affiliates'
   $all = array(
     '-',
     l(t('Content assigned to all affiliates'), 'admin/domain/content/all'),
@@ -93,6 +94,9 @@ function domain_content_list() {
     '',
   );
   array_unshift($rows, $all);
+
+  // Build result table for UI
+  $build = array();
   if (!empty($rows)) {
     $output = '<p>'. t('The table below shows all the affiliates sites whose content you may edit. Click on the site name link to see all content assigned to that affiliate.') .'</p>';
     $build['header'] = array(