diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
index 456772ea127ed3be78425b467b2e9d2599ceabe0..be8b90e33df94430a9f59aa28f2e25e918c6aa54 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
@@ -772,7 +772,10 @@ var FormUtil = new function() {
 	// Rich Text Editor Support - (CKEditor)
 	//
 	CKEDITOR.on( 'instanceReady', function( ev ) {
-	    ev.editor.dataProcessor.writer.selfClosingEnd = ' />';
+		var sessionToken = mainController.serverFacade.getSession();
+		ev.editor.config.filebrowserUploadUrl = '/openbis/file-service/eln-lims?sessionID=' + sessionToken;
+		ev.editor.config.uploadUrl = '/openbis/file-service/eln-lims?sessionID=' + sessionToken;
+		ev.editor.dataProcessor.writer.selfClosingEnd = ' />';
 	});
 	
 	this.activateRichTextProperties = function($component, componentOnChange, propertyType) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/ckeditor/js/config.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/ckeditor/js/config.js
index 495ea421641d1813b51d1f3f6edfb18fd0129823..ca8fd3d40182f5cf592b9a9ad3ae76719e762c75 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/ckeditor/js/config.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/ckeditor/js/config.js
@@ -10,9 +10,7 @@ CKEDITOR.editorConfig = function( config ) {
 	config.specialChars = config.specialChars.concat( ['α', 'β', 'γ', 'δ', 
 	                                                    'ε', 'ζ', 'η', 'θ', 'κ', 'λ', 'μ', 'ξ', 'π', 'ρ', 'σ', 
 	                                                    'υ', 'φ', 'ψ', 'ω', 'Δ', 'Σ', 'Φ', 'Ω'] );
-	config.extraPlugins='confighelper';
-//	config.extraPlugins='uploadimage,confighelper';
-//	config.uploadUrl = '/uploader/upload.php';
+	config.extraPlugins = 'uploadimage,confighelper';
 	config.stylesSet = false;
 	config.toolbarGroups = [
 	    					{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
@@ -31,5 +29,6 @@ CKEDITOR.editorConfig = function( config ) {
 	    					{ name: 'others', groups: [ 'others' ] },
 	    					{ name: 'about', groups: [ 'about' ] }
 	    				];
-	config.removeButtons = 'Save,NewPage,Templates,About,Image,Flash,Smiley,Iframe,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,Styles,Source';
+	config.removeButtons = 'Save,NewPage,Templates,About,Flash,Smiley,Iframe,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,Styles,Source';
+	
 };
\ No newline at end of file