diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc
index c1fe3acca85..2984b0d5350 100644
--- a/modules/contact/contact.pages.inc
+++ b/modules/contact/contact.pages.inc
@@ -174,11 +174,11 @@ function contact_mail_user(&$form_state, $recipient) {
   $form['recipient'] = array('#type' => 'value', '#value' => $recipient);
   $form['from'] = array('#type' => 'item',
     '#title' => t('From'),
-    '#markup' => check_plain($user->name) . ' <' . check_plain($user->mail) . '>',
+    '#markup' => theme('username', $user) . ' <' . check_plain($user->mail) . '>',
   );
   $form['to'] = array('#type' => 'item',
     '#title' => t('To'),
-    '#markup' => check_plain($recipient->name),
+    '#markup' => theme('username', $recipient),
   );
   $form['subject'] = array('#type' => 'textfield',
     '#title' => t('Subject'),