diff --git a/src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorDriver.cs b/src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorDriver.cs
index efcd4d906..13ca214e2 100644
--- a/src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorDriver.cs
+++ b/src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorDriver.cs
@@ -42,7 +42,9 @@ namespace Orchard.Core.Common.OwnerEditor {
             
             var settings = part.TypePartDefinition.Settings.GetModel<OwnerEditorSettings>();
             if (!settings.ShowOwnerEditor) {
-                part.Owner = currentUser;
+                if (part.Owner == null) {
+                    part.Owner = currentUser;
+                }
                 return null;
             }