diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
index 647847f6321cda968274c6f4784d6a896a717724..1888919e14b7376318cfe6fc33016c2b06a5a0d7 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
@@ -470,7 +470,7 @@ public class RichTextConfiguration implements Disposable {
 	public void setContentCSSFromTheme(Theme theme) {
 		// Always use default content css, then add the one from the theme
 		if (theme.getIdentifyer().equals(Theme.DEFAULTTHEME)) {
-			setContentCSS(theme.getBaseURI() + "content.css");			
+			setContentCSS(theme.getBaseURI() + "content.css");
 		} else {
 			StringOutput cssFiles = new StringOutput();
 			StaticMediaDispatcher.renderStaticURI(cssFiles, "themes/" + Theme.DEFAULTTHEME + "/content.css");
@@ -730,7 +730,7 @@ public class RichTextConfiguration implements Disposable {
 		if(contentCss != null) {
 			// add styles from content css and add them to format menu
 			copyNonValues.put(IMPORTCSS_APPEND, "true");
-			copyValues.put("content_css", Settings.createServerURI() + contentCss);
+			copyValues.put("content_css", contentCss);
 			// filter emoticons classes from content css
 			copyNonValues.put(IMPORT_SELECTOR_CONVERTER, IMPORT_SELECTOR_CONVERTER_VALUE_REMOVE_EMOTICONS);
 			// group imported css classes to paragraph, div, table and style menu
diff --git a/src/main/java/org/olat/course/assessment/AssessmentMainController.java b/src/main/java/org/olat/course/assessment/AssessmentMainController.java
index f83a09f1e9ea86dd3641c0f6437a3bbba37787d8..f4616b42fe2f86ad280b61fbfefeda43fb6e2d5c 100644
--- a/src/main/java/org/olat/course/assessment/AssessmentMainController.java
+++ b/src/main/java/org/olat/course/assessment/AssessmentMainController.java
@@ -647,6 +647,7 @@ public class AssessmentMainController extends MainLayoutBasicController implemen
 			CertificateLight certificate = certificatesManager.getCertificateLightById(certificateKey);
 			((AssessedIdentitiesTableDataModel)userListCtr
 					.getTableDataModel()).putCertificate(certificate);
+			userChoose.setDirty(true);
 		}
 	}