diff --git a/modules/user/views_handler_field_user_name.inc b/modules/user/views_handler_field_user_name.inc
index 747629ec6ff7a72554279aa8789fa7788068f6cd..5c9bd25f04099eb31bcdd7138f9d4d0b0196f6f9 100644
--- a/modules/user/views_handler_field_user_name.inc
+++ b/modules/user/views_handler_field_user_name.inc
@@ -75,7 +75,7 @@ function render_link($data, $values) {
     }
     // If we want a formatted username, do that.
     if (!empty($this->options['format_username'])) {
-      return format_username($account);
+      return user_format_name($account);
     }
     // Otherwise, there's no special handling, so return the data directly.
     return $data;
diff --git a/modules/user/views_plugin_argument_validate_user.inc b/modules/user/views_plugin_argument_validate_user.inc
index b727094452959dbae7889a6baabaf7879e128bb6..f47960925ce4af0d81457072331b46954ee40b1b 100644
--- a/modules/user/views_plugin_argument_validate_user.inc
+++ b/modules/user/views_plugin_argument_validate_user.inc
@@ -122,7 +122,7 @@ function validate_argument($argument) {
     }
 
     $this->argument->argument = $account->uid;
-    $this->argument->validated_title = check_plain(format_username($account));
+    $this->argument->validated_title = check_plain(user_format_name($account));
     return TRUE;
   }