diff --git a/src/main/java/org/olat/course/nodes/basiclti/_content/run.html b/src/main/java/org/olat/course/nodes/basiclti/_content/run.html
index 9abe81df8db2ac850f2f4f723887bcdb01ba1328..0bc6831d1cb0fb059c191e0aa81f34ba310041d7 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/_content/run.html
+++ b/src/main/java/org/olat/course/nodes/basiclti/_content/run.html
@@ -1,7 +1,7 @@
 <div class="b_iframe_wrapper">
-	<iframe  id="IMSBasicLTIFrame" src="$mapperUri"  marginwidth="0" marginheight="0" #if($width) width="${width}px" #end height="#if($height)${height}#else{400}#{end}px" style="#if($width) width:${width}px;#end #if($height)height:${height}px;#{end}"></iframe>
+	<iframe  id="IMSBasicLTIFrame" src="$mapperUri"  marginwidth="0" marginheight="0" #if($width!='auto') width="${width}px" #end height="#if($height!='auto')${height}#else 400#{end}px" style="#if($width!='auto') width:${width}px;#end #if($height!='auto')height:${height}px;#{end}"></iframe>
 </div>
-#if(!$height)
+#if(!$height || 'auto' == $height)
 	<script type="text/javascript">
 	/* <![CDATA[ */ 
 		## no window.onresize due to IE bug which triggers recurstion: http://snook.ca/archives/javascript/ie6_fires_onresize/