diff --git commitlog/includes/commitlog.views_default.inc commitlog/includes/commitlog.views_default.inc
index cba8900..a1071b5 100644
--- commitlog/includes/commitlog.views_default.inc
+++ commitlog/includes/commitlog.views_default.inc
@@ -648,8 +648,8 @@ function commitlog_views_default_views() {
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
-    'author' => array(
-      'label' => 'Author',
+    'attribution' => array(
+      'label' => '',
       'alter' => array(
         'alter_text' => 0,
         'text' => '',
@@ -665,16 +665,16 @@ function commitlog_views_default_views() {
         'max_length' => '',
         'word_boundary' => 1,
         'ellipsis' => 1,
-        'strip_tags' => 0,
         'html' => 0,
+        'strip_tags' => 0,
       ),
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
       'exclude' => 1,
-      'id' => 'author',
+      'id' => 'attribution',
       'table' => 'versioncontrol_operations',
-      'field' => 'author',
+      'field' => 'attribution',
       'relationship' => 'none',
     ),
     'vc_op_id' => array(
@@ -775,7 +775,7 @@ function commitlog_views_default_views() {
     'nothing' => array(
       'label' => '',
       'alter' => array(
-        'text' => '<div class="commit-global">Commit <strong>[revision]</strong> by <a class="author-link"  href="#"> [author]</a> [date]</div>',
+        'text' => '<div class="commit-global">Commit <strong>[revision]</strong> [attribution] [date]</div>',
         'make_link' => 0,
         'path' => '#',
         'link_class' => 'global-author',
diff --git includes/views/handlers/versioncontrol_handler_field_operation_attribution.inc includes/views/handlers/versioncontrol_handler_field_operation_attribution.inc
new file mode 100644
index 0000000..dc92731
--- /dev/null
+++ includes/views/handlers/versioncontrol_handler_field_operation_attribution.inc
@@ -0,0 +1,32 @@
+<?php
+// $Id$
+
+/**
+ * Views Field handler to show an author mapped to a drupal user if
+ * possible. It also shows the committer if it is different.
+ */
+class versioncontrol_handler_field_operation_attribution extends versioncontrol_handler_field_operation_person {
+
+  function render($values) {
+    $author_uid = $values->versioncontrol_operations_author_uid;
+    $committer_uid = $values->{$this->aliases['committer_uid']};
+
+    // Show only author if they are equal.
+    if ($author_uid == $committer_uid) {
+      $this->aliases['person_uid'] = 'versioncontrol_operations_author_uid';
+      $this->field_alias = 'versioncontrol_operations_author';
+      return parent::render($values);
+    }
+
+    // Show both if they are different.
+    $this->aliases['person_uid'] = 'versioncontrol_operations_author_uid';
+    $this->field_alias = 'versioncontrol_operations_author';
+    $author = parent::render($values);
+    $this->aliases['person_uid'] = 'versioncontrol_operations_committer_uid';
+    $this->field_alias = 'versioncontrol_operations_committer';
+    $committer = parent::render($values);
+    return t('authored by !author, committed by !committer', array(
+      '!author' => $author, '!committer' => $committer));
+  }
+
+}
diff --git includes/views/handlers/versioncontrol_handler_field_operation_author.inc includes/views/handlers/versioncontrol_handler_field_operation_author.inc
deleted file mode 100644
index 564966c..0000000
--- includes/views/handlers/versioncontrol_handler_field_operation_author.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-// $Id: versioncontrol_handler_field_operation_author.inc,v 1.1 2010/12/03 16:31:06 tizzo Exp $
-
-/**
- * Views Field handler to map the author of a commit to their drupal user.
- */
-class versioncontrol_handler_field_operation_author extends views_handler_field {
-
-  /**
-   * Called to add the field to a query.
-   */
-  function query() {
-    $this->ensure_my_table();
-    $this->field_alias = $this->query->add_field($this->table_alias, $this->real_field);
-    // Force views to load the repo_id field when this field is added so that
-    // we can appropriately build our links.
-    $this->author_uid_alias = $this->query->add_field($this->table_alias, 'author_uid');
-    $this->add_additional_fields();
-  }
-
-  function render($values) {
-    $sanitized_author = $values->{$this->field_alias};
-    // Strip out a email addresses wrapped in brackets
-    $sanitized_author = preg_replace('/\<.*@.*\>/', '', $sanitized_author);
-    // Protect against having only the email address not wrapped in <>
-    $sanitized_author = preg_replace('/@.*\..*/', '', $sanitized_author);
-    if ($values->{$this->author_uid_alias} != 0) {
-      $output = l($sanitized_author, 'user/' . $author_uid);
-    }
-    else {
-      $output = $sanitized_author; 
-    }
-    return $output;
-  }
-}
diff --git includes/views/handlers/versioncontrol_handler_field_operation_person.inc includes/views/handlers/versioncontrol_handler_field_operation_person.inc
new file mode 100644
index 0000000..fb9b4f3
--- /dev/null
+++ includes/views/handlers/versioncontrol_handler_field_operation_person.inc
@@ -0,0 +1,21 @@
+<?php
+// $Id$
+
+/**
+ * Views Field handler to show an author or committer, mapped to a
+ * drupal user if possible.
+ */
+class versioncontrol_handler_field_operation_person extends views_handler_field {
+
+  function render($values) {
+    $account->uid = $values->{$this->aliases['person_uid']};
+    if ($account->uid == 0) {
+      return $values->{$this->field_alias};
+    }
+    else {
+      $account->name = $values->{$this->field_alias};
+      return theme('username', $account);
+    }
+  }
+
+}
diff --git includes/views/versioncontrol.views.inc includes/views/versioncontrol.views.inc
index c5f1004..f1559b0 100755
--- includes/views/versioncontrol.views.inc
+++ includes/views/versioncontrol.views.inc
@@ -206,7 +206,32 @@ function versioncontrol_views_data() {
     'title'    => t('Author'),
     'help'     => t('The Operation Author'),
     'field'    => array(
-      'handler' => 'versioncontrol_handler_field_operation_author',
+      'handler' => 'versioncontrol_handler_field_operation_person',
+      'click sortable' => TRUE,
+      'additional fields' => array(
+        'person_uid' => array('table' => 'versioncontrol_operations', 'field' => 'author_uid'),
+      ),
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_string',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_string',
+    ),
+  );
+
+  $data['versioncontrol_operations']['attribution'] = array(
+    'title'    => t('Atribution'),
+    'help'     => t('The operation author(and the committer if it is different than the author)'),
+    'field'    => array(
+      'handler' => 'versioncontrol_handler_field_operation_attribution',
+      'real field' => 'author_uid',
+      'additional fields' => array(
+        'committer_uid', 'author', 'committer'
+      ),
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -234,7 +259,11 @@ function versioncontrol_views_data() {
     'title'    => t('Commiter'),
     'help'     => t('The Operation Commiter'),
     'field'    => array(
-      'handler' => 'views_handler_field',
+      'handler' => 'versioncontrol_handler_field_operation_person',
+      'click sortable' => TRUE,
+      'additional fields' => array(
+        'person_uid' => array('table' => 'versioncontrol_operations', 'field' => 'committer_uid'),
+      ),
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -553,9 +582,12 @@ function versioncontrol_views_handlers() {
       'versioncontrol_handler_field_operation_revision' => array(
         'parent' => 'views_handler_field',
       ),
-      'versioncontrol_handler_field_operation_author' => array(
+      'versioncontrol_handler_field_operation_person' => array(
         'parent' => 'views_handler_field',
       ),
+      'versioncontrol_handler_field_operation_attribution' => array(
+        'parent' => 'versioncontrol_handler_field_operation_person',
+      ),
       // filter handlers
       'versioncontrol_handler_filter_operation_type' => array(
         'parent' => 'views_handler_filter_in_operator',