diff --git a/modules/og_views/includes/og_views_handler_field_og_member_count.inc b/modules/og_views/includes/og_views_handler_field_og_member_count.inc
index 0eb2fdf..cbf5a9c 100644
--- a/modules/og_views/includes/og_views_handler_field_og_member_count.inc
+++ b/modules/og_views/includes/og_views_handler_field_og_member_count.inc
@@ -5,7 +5,33 @@ class og_views_handler_field_og_member_count extends views_handler_field_numeric
     $this->additional_fields['nid'] = array('table' => 'og', 'field' => 'nid');
   }
 
+  function construct() {
+    parent::construct();
+    $this->additional_fields['nid'] = 'nid';
+  }
+
+  function option_definition() {
+    $options = parent::option_definition();
+    $options['link_to_members'] = array('default' => TRUE);
+    return $options;
+  }
+
+  /**
+   * Provide link to members option
+   */
+  function options_form(&$form, &$form_state) {
+    parent::options_form($form, $form_state);
+    $form['link_to_members'] = array(
+      '#title' => t('Link this field to a groups members'),
+      '#description' => t('This will override any other link you have set.'),
+      '#type' => 'checkbox',
+      '#default_value' => !empty($this->options['link_to_members']),
+    );
+  }
+
   function query() {
+    $this->ensure_my_table();
+    $this->add_additional_fields();
     $table = $this->query->ensure_table('og');
     $this->add_additional_fields();
     $sql = og_list_users_sql(1, 0, NULL, TRUE);
@@ -13,17 +39,25 @@ class og_views_handler_field_og_member_count extends views_handler_field_numeric
     $this->query->add_field('', "($sql)", 'member_count');
     $this->field_alias = 'member_count';
   }
-  
-  function render($values) {
-    $nid = $values->{$this->aliases['nid']};
-    $txt = $values->member_count;
-    if (og_is_group_member($nid)) {
-      $value = og_is_picture() ? l($txt, "og/users/$nid/faces") : l($txt, "og/users/$nid");
-      return check_plain($this->options['prefix']) . $value . check_plain($this->options['suffix']);
-    }
-    else {
-      return parent::render($values);
+
+  /**
+   * Render data as a link to group members.
+   *
+   * Data should be made XSS safe prior to calling this function.
+   */
+  function render_link($data, $values) {
+    if (!empty($this->options['link_to_members']) && $data !== NULL && $data !== '') {
+      $item = menu_get_item('og/users/' . $values->{$this->aliases['nid']} . '/faces');
+      if ($item) {
+        $this->options['alter']['make_link'] = $item['access'];
+        $this->options['alter']['path'] = $item['href'];
+      }
     }
+    return $data;
+  }
+
+  function render($values) {
+    return $this->render_link(parent::render($values), $values);
   }
 }