diff --git a/modules/node/node.module b/modules/node/node.module
index 5a4e019..ec76c85 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1011,9 +1011,9 @@ function node_validate($node, $form, &$form_state) {
   if (isset($node->nid) && (node_last_changed($node->nid) > $node->changed)) {
     form_set_error('changed', t('The content on this page has either been modified by another user, or you have already submitted modifications using this form. As a result, your changes cannot be saved.'));
   }
-
+$account = user_load_by_name($node->name);
   // Validate the "authored by" field.
-  if (!empty($node->name) && !($account = user_load_by_name($node->name))) {
+  if (!empty($node->name) && !($account = format_username($account))) {
     // The use of empty() is mandatory in the context of usernames
     // as the empty string denotes the anonymous user. In case we
     // are dealing with an anonymous user we set the user ID to 0.
@@ -1051,8 +1051,9 @@ function node_validate($node, $form, &$form_state) {
 function node_submit($node) {
   // A user might assign the node author by entering a user name in the node
   // form, which we then need to translate to a user ID.
+  $account = user_load_by_name($node->name);
   if (isset($node->name)) {
-    if ($account = user_load_by_name($node->name)) {
+    if ($account = format_username($account)) {
       $node->uid = $account->uid;
     }
     else {
@@ -2604,9 +2605,10 @@ function node_feed($nids = FALSE, $channel = array()) {
 
     $node->link = url("node/$node->nid", array('absolute' => TRUE));
     $node->rss_namespaces = array();
+    $account = user_load_by_name($node->name);
     $node->rss_elements = array(
       array('key' => 'pubDate', 'value' => gmdate('r', $node->created)),
-      array('key' => 'dc:creator', 'value' => $node->name),
+      array('key' => 'dc:creator', 'value' => format_username($account)),
       array('key' => 'guid', 'value' => $node->nid . ' at ' . $base_url, 'attributes' => array('isPermaLink' => 'false'))
     );