diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Grant.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Grant.java
index 640a9a9b9..f065b3575 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Grant.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Grant.java
@@ -279,7 +279,7 @@ public class Grant implements DataEntity<Grant, UUID> {
         this.enddate = entity.getEnddate();
         this.modified = new Date();
         this.uri = entity.getUri();
-        this.funder = entity.funder;
+        //this.funder = entity.funder;
         if (entity.getContent() != null) this.content = entity.getContent();
     }
 
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Project.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Project.java
index 579ea1a85..44a5c8804 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Project.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Project.java
@@ -254,6 +254,25 @@ public class Project implements DataEntity<Project, UUID> {
 		if (entity.getContent() != null) this.content = entity.getContent();
 	}
 
+	public Project projectFromGrant(Grant grant) {
+		Project project = new Project();
+		project.setDescription(grant.getDescription());
+		project.setLabel(grant.getLabel());
+		project.setAbbreviation(grant.getAbbreviation());
+		project.setCreated(new Date());
+		project.setDefinition(grant.getDefinition());
+		project.setDmps(grant.getDmps());
+		project.setStartdate(grant.getStartdate());
+		project.setEnddate(grant.getEnddate());
+		project.setModified(new Date());
+		project.setUri(grant.getUri());
+		project.setContent(grant.getContent());
+		project.setReference(grant.getReference());
+		project.setStatus(grant.getStatus());
+
+		return project;
+	}
+
 	@Override
 	public UUID getKeys() {
 		return this.id;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 80f0b4d61..3a99c7895 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -428,6 +428,9 @@ public class DataManagementPlanManager {
         createOrganisationsIfTheyDontExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getOrganisationDao());
         createResearchersIfTheyDontExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getResearcherDao());
         createGrantIfItDoesntExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getGrantDao(), user);
+        if (newDmp.getProject().getLabel() == null) {
+            newDmp.setProject(newDmp.getProject().projectFromGrant(newDmp.getGrant()));
+        }
         createProjectIfItDoesntExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getProjectDao());
 
         DMP dmp;