1 files changed, 2 insertions, 2 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index 7a79594..44e6c47 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -63,7 +63,7 @@ class Node < ActiveRecord::Base
       draft
     elsif draft && self.lock_owner.nil?
       lock_for! current_user
-      draft.user = current_user
+      draft.user = current_user if draft.user.nil?
       draft.save
       draft
     elsif draft && self.lock_owner != current_user
@@ -80,7 +80,7 @@ class Node < ActiveRecord::Base
   
   def create_new_draft user
     empty_page = self.pages.create!
-    empty_page.user = user unless (self.head && self.head.user)
+    empty_page.user = (self.head ? self.head.user : user)
     empty_page.save
     
     empty_page.clone_attributes_from self.head