diff --git a/modules/user/views_handler_field_user_name.inc b/modules/user/views_handler_field_user_name.inc
index 26cdbce..d23117a 100644
--- a/modules/user/views_handler_field_user_name.inc
+++ b/modules/user/views_handler_field_user_name.inc
@@ -30,7 +30,7 @@ class views_handler_field_user_name extends views_handler_field_user {
       '#title' => t('Use formatted username'),
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['format_username']),
-      '#description' => t('If checked, the username will be formatted by the system. If unchecked, it will be displayed raw.'),
+      '#description' => t('If checked, the username will be formatted by the system. If unchecked, it will be displayed raw. This setting is overridden by the link-to-user checkbox.'),
       '#fieldset' => 'more',
     );
     $form['overwrite_anonymous'] = array(
@@ -57,20 +57,21 @@ class views_handler_field_user_name extends views_handler_field_user {
     $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'])) {
-      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'])) {
-        $account->name = $this->get_value($values);
-        return theme('username', array('account' => $account));
-      }
+
+    if (!empty($this->options['overwrite_anonymous']) && !$account->uid) {
+      // This is an anonymous user, and we're overwriting the text.
+      return check_plain($this->options['anonymous_text']);
+    }
+    elseif (!empty($this->options['link_to_user'])) {
+      $account->name = $this->get_value($values);
+      return theme('username', array('account' => $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;
   }