diff --git a/src/java/fr/paris/lutece/plugins/forms/web/entrytype/EntryTypeDefaultDisplayService.java b/src/java/fr/paris/lutece/plugins/forms/web/entrytype/EntryTypeDefaultDisplayService.java
index 6996815ab..1b4b367cb 100644
--- a/src/java/fr/paris/lutece/plugins/forms/web/entrytype/EntryTypeDefaultDisplayService.java
+++ b/src/java/fr/paris/lutece/plugins/forms/web/entrytype/EntryTypeDefaultDisplayService.java
@@ -46,7 +46,10 @@
 import fr.paris.lutece.plugins.genericattributes.business.Entry;
 import fr.paris.lutece.plugins.genericattributes.service.entrytype.EntryTypeServiceManager;
 import fr.paris.lutece.plugins.genericattributes.service.entrytype.IEntryTypeService;
+import fr.paris.lutece.portal.service.editor.RichTextContentService;
+import fr.paris.lutece.portal.service.editor.RichTextParsingException;
 import fr.paris.lutece.portal.service.template.AppTemplateService;
+import fr.paris.lutece.portal.service.util.AppLogService;
 
 /**
  * The default display service
@@ -78,9 +81,17 @@ public EntryTypeDefaultDisplayService( String strEntryServiceName )
      */
     private Map<String, Object> setModel( Entry entry, Map<String, Object> model )
     {
-        model.put( FormsConstants.QUESTION_ENTRY_MARKER, entry );
-
-        return model;
+        try 
+        {
+            entry.setComment( RichTextContentService.getContent( entry.getComment( ) ) );
+            model.put( FormsConstants.QUESTION_ENTRY_MARKER, entry );
+            return model;
+        }
+        catch (RichTextParsingException e) 
+        {
+            AppLogService.error(e.getMessage(), e);
+            return model;
+        }
     }
 
     /**
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_auto_file_reading.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_auto_file_reading.html
index 17dbfdfa2..00fe0f829 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_auto_file_reading.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_auto_file_reading.html
@@ -70,7 +70,5 @@
         </@box>
     </@columns>
 </@row>
-<#include "/admin/util/editor/editor.html" />
-<@initEditor />
 <@anonymPattern />
  
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_camera.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_camera.html
index ac8a50613..6aeeb6195 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_camera.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_camera.html
@@ -73,6 +73,4 @@
 		</@box>
 	</@columns>
 </@row>
-<#include "/admin/util/editor/editor.html" />
-<@initEditor />
 <@anonymPattern />
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_cartography.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_cartography.html
index d1ea63765..48472da5d 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_cartography.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_cartography.html
@@ -99,6 +99,4 @@
 		});
 	})
 	</script>
-<#include "/admin/util/editor/editor.html" />
-<@initEditor />
 <@anonymPattern />
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_check_box.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_check_box.html
index d8432acc9..a0eaeeb24 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_check_box.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_check_box.html
@@ -69,8 +69,4 @@
 			</@boxBody>
 		</@box>
 	</@columns>
-</@row>
-
-<#include "/admin/util/editor/editor.html" />
-<@initEditor />
- 
\ No newline at end of file
+</@row>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_comment.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_comment.html
index 67a3d7e34..42826e347 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_comment.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_comment.html
@@ -51,7 +51,5 @@
 		</@box>
 	</@columns>
 </@row>
-
 <#include "/admin/util/editor/editor.html" />
-<@initEditor />
- 
\ No newline at end of file
+<@initEditor />
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_date.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_date.html
index 3725b0e95..388b8ffd7 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_date.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_date.html
@@ -75,8 +75,5 @@
 		</@box>
 	</@columns>
 </@row>
-
-<#include "/admin/util/editor/editor.html" />
-<@initEditor />
 <@anonymPattern />
 <@toDayDate />
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_file.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_file.html
index e384f9997..af6531ac5 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_file.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_file.html
@@ -69,8 +69,6 @@
 		</@box>
 	</@columns>
 </@row>
-<#include "/admin/util/editor/editor.html" />
-<@initEditor />
 <@anonymPattern />
 <script>
 <#noparse>
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_gallery_image.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_gallery_image.html
index 85b3b4bd4..5a1d71343 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_gallery_image.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_gallery_image.html
@@ -66,9 +66,6 @@
         </@box>
     </@columns>
 </@row>
-
-<#include "/admin/util/editor/editor.html" />
-<@initEditor />
  <@anonymPattern />
  <script>
 $(function() {
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_geolocation.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_geolocation.html
index 1eba925bf..6e741bea3 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_geolocation.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_geolocation.html
@@ -103,6 +103,4 @@
 		});
 	})
 	</script>
-<#include "/admin/util/editor/editor.html" />
-<@initEditor />
 <@anonymPattern />
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_image.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_image.html
index fd93af3f9..8c70dd2c8 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_image.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_image.html
@@ -72,8 +72,4 @@
         </@box>
     </@columns>
 </@row>
-
-<#include "/admin/util/editor/editor.html" />
-<@initEditor />
- <@anonymPattern />
- 
\ No newline at end of file
+<@anonymPattern /> 
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_number.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_number.html
index b9d87e232..fec343bc9 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_number.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_number.html
@@ -91,9 +91,7 @@
 			</@boxBody>
 		</@box>
 	</@columns>
-</@row>   
-<#include "/admin/util/editor/editor.html" />
-<@initEditor />
+</@row>
 <script>
 document.addEventListener('DOMContentLoaded', function () {
 	const form = document.getElementById('form-number');
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_radio_button.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_radio_button.html
index 7ca7c8a1d..c802844eb 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_radio_button.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_radio_button.html
@@ -68,7 +68,4 @@
 			</@boxBody>
 		</@box>
 	</@columns>
-</@row>
-
-<#include "/admin/util/editor/editor.html" />
-<@initEditor />
\ No newline at end of file
+</@row>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_select.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_select.html
index 16b3b4c4f..9ef969a37 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_select.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_select.html
@@ -64,7 +64,4 @@
             </@boxBody>
         </@box>
     </@columns>
-</@row>
-
-<#include "/admin/util/editor/editor.html" />
-<@initEditor /> 
+</@row>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_select_order.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_select_order.html
index 2fa7f677a..eae3a3e77 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_select_order.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_select_order.html
@@ -65,6 +65,4 @@
             </@boxBody>
         </@box>
     </@columns>
-</@row>
-<#include "/admin/util/editor/editor.html" />
-<@initEditor /> 
\ No newline at end of file
+</@row>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_slot.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_slot.html
index 579427682..3cfe7402c 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_slot.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_slot.html
@@ -1,5 +1,4 @@
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 ${breadcrumb_template}
 <@row>
 	<@columns>
@@ -75,5 +74,4 @@
 		} 
 	});
 });
-</script>
-<@initEditor />
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text.html
index cb4eff84c..60b08b7c8 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text.html
@@ -87,8 +87,5 @@
 		</@box>
 	</@columns>
 </@row>   
-<#include "/admin/util/editor/editor.html" />
 <@confirmField />
-<@anonymPattern />
-<@initEditor />
- 
\ No newline at end of file
+<@anonymPattern />
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text_area.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text_area.html
index d3d7ec46f..bb553b03d 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text_area.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text_area.html
@@ -85,7 +85,4 @@
 	</@columns>
 </@row>
 
-<#include "/admin/util/editor/editor.html" />
-<@anonymPattern />
-<@initEditor />
- 
\ No newline at end of file
+<@anonymPattern />
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_array.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_array.html
index aaa7683e9..5db1bd4b6 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_array.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_array.html
@@ -1,4 +1,3 @@
-<#include "all_entry_commons.html" />
 <#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
@@ -101,5 +100,4 @@
 	</@columns>
 </@tform>
 </@row>
-<@initEditor />
-<@anonymPattern />
+<@anonymPattern />
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_auto_file_reading.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_auto_file_reading.html
index 96c12d823..bc0bc03c3 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_auto_file_reading.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_auto_file_reading.html
@@ -1,5 +1,4 @@
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 <@row>
@@ -95,5 +94,4 @@
 	${ocr_mapping_template!}
 	<!-- ---------------------------------------------------------------- -->
 </@row>
-<@initEditor />
-<@anonymPattern />
+<@anonymPattern />
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_camera.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_camera.html
index f98049377..cf1b3517e 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_camera.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_camera.html
@@ -94,6 +94,4 @@
 		</@box>
 	</@columns>
 </@row>
-<#include "/admin/util/editor/editor.html" />
 <@anonymPattern />
-<@initEditor />
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_cartography.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_cartography.html
index 6d1b54c50..ad2db3366 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_cartography.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_cartography.html
@@ -1,6 +1,5 @@
 
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 <@row>
@@ -116,5 +115,4 @@
         }
     });
 })
-</script>
- <@initEditor />
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_check_box.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_check_box.html
index 93e0cb517..f8e1e2adf 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_check_box.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_check_box.html
@@ -1,6 +1,5 @@
 
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 <@row>
@@ -148,5 +147,4 @@
 			</#if>
 		</@box>
 	</@columns>
-</@row>
-<@initEditor />
+</@row>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_date.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_date.html
index 48fefe307..6a64a3add 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_date.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_date.html
@@ -1,7 +1,5 @@
 
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
-
 ${breadcrumb_template}
 <@row>
 	<@columns>
@@ -99,5 +97,4 @@
 	</@columns>
 </@row>
 <@anonymPattern />
-<@initEditor />
 <@toDayDate />
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_file.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_file.html
index 18717e1f3..0cc78a96d 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_file.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_file.html
@@ -1,5 +1,4 @@
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 <@row>
@@ -84,7 +83,6 @@
 		</@box>
 	</@columns>
 </@row>
-<@initEditor />
 <@anonymPattern />
 <script>
 $( function(){
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_gallery_image.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_gallery_image.html
index 2b5903a60..99006dcff 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_gallery_image.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_gallery_image.html
@@ -1,5 +1,4 @@
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 <@row>
@@ -78,7 +77,6 @@
 		</@box>
 	</@columns>
 </@row>
-<@initEditor />
 <@anonymPattern />
 <script>
 $(function() {
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_geolocation.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_geolocation.html
index e070bf281..3a6147c64 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_geolocation.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_geolocation.html
@@ -1,6 +1,5 @@
 
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 <@row>
@@ -128,5 +127,4 @@
         }
     });
 })
-</script>
- <@initEditor />
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_group.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_group.html
index 1335ed47f..eaca617f0 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_group.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_group.html
@@ -1,6 +1,5 @@
 
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 
@@ -77,7 +76,6 @@
 		</@box>
 	</@columns>
 </@row>
-<@initEditor />
 <script type="text/javascript">
 	function displayHideIteration( )
 	{
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_image.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_image.html
index 827b17f30..1b98aa51d 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_image.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_image.html
@@ -1,5 +1,4 @@
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 <@row>
@@ -84,5 +83,4 @@
 		</@box>
 	</@columns>
 </@row>
-<@initEditor />
 <@anonymPattern />
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_mylutece_user_attribute.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_mylutece_user_attribute.html
index fe7b138e6..bcbbf3531 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_mylutece_user_attribute.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_mylutece_user_attribute.html
@@ -1,5 +1,4 @@
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_number.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_number.html
index adc0e2e69..4fec8ae8b 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_number.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_number.html
@@ -1,6 +1,5 @@
 
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 
@@ -115,7 +114,6 @@
 		</@box>
 	</@columns>
 </@row>
-<@initEditor />
 <@anonymPattern />
 <script>
 function setStep(c,i){
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_radio_button.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_radio_button.html
index d3cfad4a3..1a27051ef 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_radio_button.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_radio_button.html
@@ -1,5 +1,4 @@
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 <@row>
@@ -146,5 +145,4 @@
 			</#if>
 		</@box>
 	</@columns>
-</@row>
-<@initEditor />
\ No newline at end of file
+</@row>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_select.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_select.html
index 445f7bff2..0111f659b 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_select.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_select.html
@@ -1,5 +1,4 @@
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 <@row>
@@ -126,5 +125,4 @@
 			</#if>
 		</@box>
 	</@columns>
-</@row>
-<@initEditor />
+</@row>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_select_order.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_select_order.html
index f7a40bc45..3dd585879 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_select_order.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_select_order.html
@@ -1,5 +1,4 @@
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 
 ${breadcrumb_template}
 <@row>
@@ -134,5 +133,4 @@
 			</#if>
 		</@box>
 	</@columns>
-</@row>
-<@initEditor />
+</@row>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_session.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_session.html
index 94991486e..2181e6905 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_session.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_session.html
@@ -1,6 +1,4 @@
-
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 ${breadcrumb_template}
 <@row>
     <@columns>
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_slot.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_slot.html
index c4d8c6ac3..72a020d51 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_slot.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_slot.html
@@ -1,5 +1,4 @@
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 ${breadcrumb_template}
 <@row>
     <@columns>
@@ -86,5 +85,4 @@
 		} 
 	});
 });
-</script>
-<@initEditor />
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_text.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_text.html
index 2a90b2add..0fd0bf514 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_text.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_text.html
@@ -1,6 +1,5 @@
 
 <#include "all_entry_commons.html" />
-<#include "/admin/util/editor/editor.html" />
 ${breadcrumb_template}
 <@row>
 	<@columns>
@@ -135,5 +134,4 @@
 	</@columns>
 </@row>
 <@confirmField />
-<@anonymPattern />
-<@initEditor />
\ No newline at end of file
+<@anonymPattern />
\ No newline at end of file