--- a/modules/user/views_handler_field_user_name.inc	(revision 269)
+++ b/modules/user/views_handler_field_user_name.inc	(working copy)
@@ -60,23 +60,20 @@
   }
 
   function render_link($data, $values) {
-    $account = new stdClass();
-    $account->uid = $this->get_value($values, 'uid');
-    $account->name = $this->get_value($values);
-    if (!empty($this->options['link_to_user']) || !empty($this->options['overwrite_anonymous'])) {
+    $data = parent::render_link($data, $values);
+    if (!empty($this->options['overwrite_anonymous']) || !empty($this->options['format_username'])) {
+      $account = new stdClass();
+      $account->uid = $this->get_value($values, 'uid');
       if (!empty($this->options['overwrite_anonymous']) && !$account->uid) {
         // This is an anonymous user, and we're overriting the text.
         return check_plain($this->options['anonymous_text']);
       }
-      elseif (!empty($this->options['link_to_user'])) {
+      elseif (!empty($this->options['format_username'])) {
+        // If we want a formatted username, do that.
         $account->name = $this->get_value($values);
-        return theme('username', array('account' => $account));
+        return format_username($account);
       }
     }
-    // If we want a formatted username, do that.
-    if (!empty($this->options['format_username'])) {
-      return format_username($account);
-    }
     // Otherwise, there's no special handling, so return the data directly.
     return $data;
   }