Index: /CKEditor.NET/trunk/CHANGES.html
===================================================================
--- /CKEditor.NET/trunk/CHANGES.html	(revision 7279)
+++ /CKEditor.NET/trunk/CHANGES.html	(revision 7280)
@@ -80,4 +80,5 @@
 			Fixed issues:</p>
 	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/8154">#8154</a> : Configurations were not honoured when set by code. Moved scripts registration from OnLoad to OnPreRender.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/8089">#8089</a> : Editor disappears on Ajax postback.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/8005">#8005</a> : Editor not displayed after postback in Dynamic Data site.</li>
Index: /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs
===================================================================
--- /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 7279)
+++ /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 7280)
@@ -1023,7 +1023,7 @@
 		#region Override Method
 		private string timestamp = "?t=B1GG4Z6";
-		protected override void OnLoad(EventArgs e)
-		{
-			base.OnLoad(e);
+		protected override void OnPreRender(EventArgs e)
+		{
+			base.OnPreRender(e);
 			this.RegisterStartupScript(this.GetType(), "CKEDITOR_BASEPATH", string.Format("window.CKEDITOR_BASEPATH = '{0}/';\n", (this.CKEditorJSFile.StartsWith("~") ? this.ResolveUrl(this.BasePath) : this.BasePath)), true);
 			this.RegisterStartupScript(this.GetType(), "ckeditor", "<script src=\"" + (this.CKEditorJSFile.StartsWith("~") ? this.ResolveUrl(this.CKEditorJSFile) : this.CKEditorJSFile) + timestamp + "\" type=\"text/javascript\"></script>", false);