diff --git a/src/main/java/it/inaf/oats/vospace/CreateNodeController.java b/src/main/java/it/inaf/oats/vospace/CreateNodeController.java
index b3250614ff98a092b6ec8a2ea6b63e27c92d5c6c..3110cecc1b1150ac889800c102574dad9ac1301a 100644
--- a/src/main/java/it/inaf/oats/vospace/CreateNodeController.java
+++ b/src/main/java/it/inaf/oats/vospace/CreateNodeController.java
@@ -1,6 +1,7 @@
 package it.inaf.oats.vospace;
 
 import it.inaf.ia2.aa.data.User;
+import it.inaf.oats.vospace.datamodel.NodeProperties;
 import it.inaf.oats.vospace.datamodel.NodeUtils;
 import net.ivoa.xml.vospace.v2.Node;
 import org.springframework.http.MediaType;
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.PutMapping;
 import it.inaf.oats.vospace.exception.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import net.ivoa.xml.vospace.v2.Property;
+import java.util.List;
 
 @RestController
 public class CreateNodeController extends BaseNodeController {
@@ -67,6 +70,25 @@ public class CreateNodeController extends BaseNodeController {
         if(!NodeUtils.checkIfWritable(parentNode, principal.getName(), principal.getGroups())) {
             throw new PermissionDeniedException(path);
         }
+        
+        // Check if node creator property is set. If not set it according to 
+        // token. In case of creator mistmatch between node and token throw
+        // exception
+        
+        String creator = NodeProperties.getNodePropertyByURI(
+                node, NodeProperties.CREATOR_URI);
+        
+        if(creator == null)
+        {
+            Property creatorProperty = new Property();
+            creatorProperty.setUri(NodeProperties.CREATOR_URI);
+            creatorProperty.setValue(principal.getName());
+            node.getProperties().add(creatorProperty);
+        } else {
+            if(!creator.equals(principal.getName()))
+                // maybe a more specific exception would be more appropriate?
+                throw new PermissionDeniedException(path);
+        }       
 
         nodeDao.createNode(node);
 
diff --git a/src/test/java/it/inaf/oats/vospace/CreateNodeControllerTest.java b/src/test/java/it/inaf/oats/vospace/CreateNodeControllerTest.java
index 27058b09be18a34e4ee6fd68f38cfc8fb4567e73..baeef5d3ab6eea039951c222448ff44e8e9f4c7f 100644
--- a/src/test/java/it/inaf/oats/vospace/CreateNodeControllerTest.java
+++ b/src/test/java/it/inaf/oats/vospace/CreateNodeControllerTest.java
@@ -5,6 +5,7 @@ import java.io.InputStream;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import net.ivoa.xml.vospace.v2.Property;
+import it.inaf.oats.vospace.datamodel.NodeProperties;
 import net.ivoa.xml.vospace.v2.UnstructuredDataNode;
 import org.junit.jupiter.api.Test;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -271,6 +272,57 @@ public class CreateNodeControllerTest {
         verifyArguments();
         verify(nodeDao, times(1)).createNode(any());
     }
+    
+    @Test
+    public void testWriteOwnerAbsent() throws Exception {
+         String requestBody = 
+                 getResourceFileContent("create-unstructured-data-node.xml");
+         
+         when(nodeDao.listNode(eq("/")))
+                .thenReturn(Optional.of(getContainerParentNodeWithCreator("/")));
+         
+         // no node creator specified in xml file
+         
+         mockMvc.perform(put("/nodes/mydata1")
+                .header("Authorization", "Bearer user2_token")
+                .content(requestBody)
+                .contentType(MediaType.APPLICATION_XML)
+                .accept(MediaType.APPLICATION_XML))
+                .andDo(print())
+                .andExpect(status().is2xxSuccessful());
+         
+        // assert creator properties now matches user2
+         verify(nodeDao, times(1)).createNode(argThat(node->{
+             UnstructuredDataNode udn = (UnstructuredDataNode) node;
+             String creator = NodeProperties.getNodePropertyByURI(
+                udn, NodeProperties.CREATOR_URI);
+             return (creator != null && creator.equals("user2"));         
+         }
+         ));
+        
+    }
+    
+    @Test
+    public void testWriteOwnerMismatch() throws Exception {
+         String requestBody = 
+                 getResourceFileContent("create-unstructured-data-node-user1.xml");
+         
+         when(nodeDao.listNode(eq("/")))
+                .thenReturn(Optional.of(getContainerParentNodeWithCreator("/")));
+         
+         // no node creator specified in xml file
+         
+         mockMvc.perform(put("/nodes/mydata1")
+                .header("Authorization", "Bearer user2_token")
+                .content(requestBody)
+                .contentType(MediaType.APPLICATION_XML)
+                .accept(MediaType.APPLICATION_XML))
+                .andDo(print())
+                .andExpect(status().is4xxClientError());
+         
+        // assert createNode is not called
+         verify(nodeDao, times(0)).createNode(any());        
+    }
 
     @Test
     public void testSubPath() throws Exception {
diff --git a/src/test/resources/create-unstructured-data-node-user1.xml b/src/test/resources/create-unstructured-data-node-user1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..82d50ca847b3d3d16d47beba0412c57e18959521
--- /dev/null
+++ b/src/test/resources/create-unstructured-data-node-user1.xml
@@ -0,0 +1,11 @@
+<vos:node xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xmlns:vos="http://www.ivoa.net/xml/VOSpace/v2.0" xsi:type="vos:UnstructuredDataNode" uri="vos://example.com!vospace/mydata1">
+    <vos:properties>
+        <vos:property uri="ivo://ivoa.net/vospace/core#description">test value</vos:property>        
+        <vos:property uri="ivo://ivoa.net/vospace/core#creator">user1</vos:property>
+    </vos:properties>
+    <vos:accepts/>
+    <vos:provides/>
+    <vos:capabilities/>
+</vos:node>
\ No newline at end of file
diff --git a/src/test/resources/create-unstructured-data-node.xml b/src/test/resources/create-unstructured-data-node.xml
index 1c8e8e6fe08c12300d9ddcc6daa3b6cbedba65da..11f10fcfa9f85d3fece0d30f7e457238e11062c4 100644
--- a/src/test/resources/create-unstructured-data-node.xml
+++ b/src/test/resources/create-unstructured-data-node.xml
@@ -2,7 +2,7 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xmlns:vos="http://www.ivoa.net/xml/VOSpace/v2.0" xsi:type="vos:UnstructuredDataNode" uri="vos://example.com!vospace/mydata1">
     <vos:properties>
-        <vos:property uri="ivo://ivoa.net/vospace/core#description">test value</vos:property>
+        <vos:property uri="ivo://ivoa.net/vospace/core#description">test value</vos:property>        
     </vos:properties>
     <vos:accepts/>
     <vos:provides/>