diff --git a/src/main/java/org/olat/course/nodes/ScormCourseNode.java b/src/main/java/org/olat/course/nodes/ScormCourseNode.java
index 81f0a8354a32c7349a89f20759342eb439b38752..077a456bdd967d6268eb4e3a2bebf121420aede3 100644
--- a/src/main/java/org/olat/course/nodes/ScormCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/ScormCourseNode.java
@@ -183,7 +183,7 @@ public class ScormCourseNode extends AbstractAccessableCourseNode implements Ass
 			config.setBooleanEntry(NodeEditController.CONFIG_STARTPAGE, Boolean.TRUE.booleanValue());
 			config.setBooleanEntry(NodeEditController.CONFIG_COMPONENT_MENU, Boolean.TRUE.booleanValue());
 			config.setBooleanEntry(ScormEditController.CONFIG_SHOWNAVBUTTONS, Boolean.TRUE.booleanValue());
-			config.set(ScormEditController.CONFIG_HEIGHT, ScormEditController.CONFIG_HEIGHT_AUTO);
+			config.set(ScormEditController.CONFIG_HEIGHT, "680");
 			config.set(NodeEditController.CONFIG_CONTENT_ENCODING, NodeEditController.CONFIG_CONTENT_ENCODING_AUTO);	
 			config.set(NodeEditController.CONFIG_JS_ENCODING, NodeEditController.CONFIG_JS_ENCODING_AUTO);	
 			//fxdiff FXOLAT-116: SCORM improvements
@@ -193,6 +193,7 @@ public class ScormCourseNode extends AbstractAccessableCourseNode implements Ass
 			config.setBooleanEntry(ScormEditController.CONFIG_ATTEMPTSDEPENDONSCORE, false);
 			config.setIntValue(ScormEditController.CONFIG_MAXATTEMPTS, 0);
 			config.setConfigurationVersion(CURRENT_CONFIG_VERSION);
+			config.setBooleanEntry(ScormEditController.CONFIG_RAW_CONTENT, true);
 		} else {
 			int version = config.getConfigurationVersion();
 			if (version < CURRENT_CONFIG_VERSION) {
diff --git a/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java b/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java
index e70394b90c62ec51c78eda090747580043047297..c9fafa3d617cbb6d054f70442c67b7f40f01cb43 100644
--- a/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java
+++ b/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java
@@ -194,7 +194,7 @@ public class ScormEditController extends ActivateableTabbableDefaultController i
 		boolean advanceScore = config.getBooleanSafe(CONFIG_ADVANCESCORE, true);
 		// </OLATCE-289>
 		int cutvalue = config.getIntegerSafe(CONFIG_CUTVALUE, 0);
-		boolean rawContent = config.getBooleanSafe(CONFIG_RAW_CONTENT, false);
+		boolean rawContent = config.getBooleanSafe(CONFIG_RAW_CONTENT, true);
 		String height = (String) config.get(CONFIG_HEIGHT);
 		String encContent = (String) config.get(NodeEditController.CONFIG_CONTENT_ENCODING);
 		String encJS = (String) config.get(NodeEditController.CONFIG_JS_ENCODING);
diff --git a/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java b/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java
index 24c179f7d6cf35acdf44e0a4f68729254a0cef40..b5ef9fd47c7676c0e349632455e6ca373478f867 100644
--- a/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java
+++ b/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java
@@ -300,11 +300,14 @@ public class ScormRunController extends BasicController implements ScormAPICallb
 		// configure some display options
 		boolean showNavButtons = config.getBooleanSafe(ScormEditController.CONFIG_SHOWNAVBUTTONS, true);
 		scormDispC.showNavButtons(showNavButtons);
-		boolean rawContent = config.getBooleanSafe(ScormEditController.CONFIG_RAW_CONTENT, false);
+		boolean rawContent = config.getBooleanSafe(ScormEditController.CONFIG_RAW_CONTENT, true);
 		scormDispC.setRawContent(rawContent);
 		String height = (String) config.get(ScormEditController.CONFIG_HEIGHT);
 		if (!height.equals(ScormEditController.CONFIG_HEIGHT_AUTO)) {
 			scormDispC.setHeightPX(Integer.parseInt(height));
+		} else if(config.getBooleanSafe(ScormEditController.CONFIG_RAW_CONTENT, true)) {
+			//height auto but raw content set -> set default
+			scormDispC.setHeightPX(680);
 		}
 		String contentEncoding = (String) config.get(NodeEditController.CONFIG_CONTENT_ENCODING);
 		if (!contentEncoding.equals(NodeEditController.CONFIG_CONTENT_ENCODING_AUTO)) {
diff --git a/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_de.properties
index 71ea0e5239735bed12a0bcc8d396d0f8f71ce7e4..26060e76c95d54815ea68423b33d8d922de2bc87 100644
--- a/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_de.properties
@@ -43,7 +43,7 @@ condition.accessibility.title=Zugang
 cutvalue.label=Notwendige Punktzahl f\u00FCr 'bestanden'
 cutvalue.validation=Geben Sie eine Ganzzahl ein
 rawcontent.height.error=Wenn Sie "$\:rawcontent.label" ausgew\u00E4hlt haben, m\u00FCssen Sie die H\u00F6he der Anzeigefl\u00E4che setzen.
-rawcontent.label=Raw content
+rawcontent.label=Standardmodus
 encoding.content=Zeichensatz Inhalt
 encoding.js=Zeichensatz Javascript
 encoding.auto=Automatisch
diff --git a/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_en.properties
index 31fa6ab9f0b12a5f47e59daeab99bd4a0690c3b7..fdfd76f51bb067047646c99ccfcfae5a6f89350e 100644
--- a/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_en.properties
@@ -74,7 +74,7 @@ passed.no=Failed
 passed.yes=Passed
 passed.yourpassed=Status
 rawcontent.height.error=If "$\:rawcontent.label" is set, you need to specify the height of the window
-rawcontent.label=Raw content
+rawcontent.label=Standard mode
 score.noscoreinfoyet=There is no score available for this SCORM object since you have never used it before.
 score.title=Score
 score.yourscore=Score achieved
diff --git a/src/main/java/org/olat/modules/scorm/ScormMainManager.java b/src/main/java/org/olat/modules/scorm/ScormMainManager.java
index dcb694bcf0cfe913f611777aba45de970eb2da66..2291cb1ad4bc20fe6f5aeab0827a49f540d6be52 100644
--- a/src/main/java/org/olat/modules/scorm/ScormMainManager.java
+++ b/src/main/java/org/olat/modules/scorm/ScormMainManager.java
@@ -66,8 +66,10 @@ public class ScormMainManager extends BasicManager {
 			File cpRoot, String resourceId, String courseId, String lesson_mode, String credit_mode,
 			boolean previewMode, String assessableType, boolean activate, boolean fullWindow, boolean attemptsIncremented) {
 		
-		return new ScormAPIandDisplayController(ureq, wControl, showMenu, apiCallback, cpRoot, resourceId, courseId, lesson_mode, credit_mode,
+		ScormAPIandDisplayController ctrl= new ScormAPIandDisplayController(ureq, wControl, showMenu, apiCallback, cpRoot, resourceId, courseId, lesson_mode, credit_mode,
 				previewMode, assessableType, activate, fullWindow, attemptsIncremented);
+		ctrl.setRawContent(true);
+		return ctrl;
 	}
 	
 }