diff --git a/includes/modules/user.inc b/includes/modules/user.inc
index 116198e..7ec3d19 100644
--- a/includes/modules/user.inc
+++ b/includes/modules/user.inc
@@ -13,6 +13,10 @@ function user_uuid_node_features_export_render_alter(&$export, &$node, $module)
   if ($uuid) {
     $export->user_uuid = $uuid;
   }
+  unset($export->uid);
+  // Ensure we don't export the name or uid property which could lead to a user
+  // override due to the handling in node_submit().
+  unset($export->name);
 }
 
 /**
diff --git a/includes/uuid_node.features.inc b/includes/uuid_node.features.inc
index 2cd9dba..60964f1 100755
--- a/includes/uuid_node.features.inc
+++ b/includes/uuid_node.features.inc
@@ -106,7 +106,6 @@ function uuid_node_features_export_render($module, $data) {
     unset($export->last_comment_id);
     unset($export->last_comment_name);
     unset($export->cid);
-    unset($node->name);
 
     $code[] = '  $nodes[] = ' . features_var_export($export) . ';';
   }