diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
index a325194b9..9863ec9ff 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
@@ -941,10 +941,14 @@ public class WordBuilder {
                         } else if(datasetEntity != null && text.contains("{ARGOS.DATASET.TITLE}")) {
                             text = text.replace("{ARGOS.DATASET.TITLE}", datasetEntity.getLabel());
                             r.setText(text, 0);
-                        } else if(datasetEntity != null && text.contains("{ARGOS.DATASET.DESCRIPTION}")) {
+                        } else if((dmpEntity != null && text.contains("{ARGOS.DMP.DESCRIPTION}")) || (datasetEntity != null && text.contains("{ARGOS.DATASET.DESCRIPTION}"))) {
                             descrParPos = parPos;
                             descrPar = p;
-                            text = text.replace("{ARGOS.DATASET.DESCRIPTION}", "");
+                            if(dmpEntity != null) {
+                                text = text.replace("{ARGOS.DMP.DESCRIPTION}", "");
+                            } else {
+                                text = text.replace("{ARGOS.DATASET.DESCRIPTION}", "");
+                            }
                             r.setText(text, 0);
                         } else if(text.equals("{ARGOS.DMP.RESEARCHERS}")) {
                             String researchersNames = "";
@@ -974,7 +978,14 @@ public class WordBuilder {
             }
             parPos++;
         }
-        if(descrParPos != -1 && datasetEntity.getDescription() != null) {
+        if(descrParPos != -1 && dmpEntity!=null && dmpEntity.getDescription() != null) {
+            XmlCursor cursor = descrPar.getCTP().newCursor();
+            cursor.toNextSibling();
+            Document htmlDoc = Jsoup.parse(((String)dmpEntity.getDescription()).replaceAll("\n", "<br>"));
+            HtmlToWorldBuilder htmlToWorldBuilder = new HtmlToWorldBuilder(descrPar, 0, cursor);
+            NodeTraversor.traverse(htmlToWorldBuilder, htmlDoc);
+        }
+        if(descrParPos != -1 && datasetEntity != null && datasetEntity.getDescription() != null) {
             XmlCursor cursor = descrPar.getCTP().newCursor();
             cursor.toNextSibling();
             Document htmlDoc = Jsoup.parse(((String)datasetEntity.getDescription()).replaceAll("\n", "<br>"));
diff --git a/dmp-backend/web/src/main/resources/documents/h2020.docx b/dmp-backend/web/src/main/resources/documents/h2020.docx
index 9d5713b26..084eb42d8 100644
Binary files a/dmp-backend/web/src/main/resources/documents/h2020.docx and b/dmp-backend/web/src/main/resources/documents/h2020.docx differ