Index: /CKEditor.NET/trunk/CHANGES.html
===================================================================
--- /CKEditor.NET/trunk/CHANGES.html	(revision 6687)
+++ /CKEditor.NET/trunk/CHANGES.html	(revision 6688)
@@ -72,4 +72,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/7283">#7283</a> : Entered text is not HTML encoded.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/7302">#7302</a> : It was impossible to customise the editor inside masterpage and if attributes were placed in front of the Control ID.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7590">#7590</a> : Error when trying to reset values in the Properties window.</li>
 	</ul>
 	<h2>
Index: /CKEditor.NET/trunk/CKEditor.NET/CKEditorConfig.cs
===================================================================
--- /CKEditor.NET/trunk/CKEditor.NET/CKEditorConfig.cs	(revision 6687)
+++ /CKEditor.NET/trunk/CKEditor.NET/CKEditorConfig.cs	(revision 6688)
@@ -1095,6 +1095,5 @@
 		/// Default Value: []
 		/// </summary>
-		[CKSerializable(IsObject = true)]
-		public object[] protectedSource { get; set; }
+		public string [] protectedSource { get; set; }
 
 		/// <summary>
@@ -1778,5 +1777,5 @@
 			//	todo
 			//this.plugins = string.Empty;
-			GlobalConfigObj.protectedSource = new object[0];
+			GlobalConfigObj.protectedSource = new string[0];
 			GlobalConfigObj.removeDialogTabs = string.Empty;
 			GlobalConfigObj.removeFormatAttributes = "class,style,lang,width,height,align,hspace,valign";
Index: /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs
===================================================================
--- /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 6687)
+++ /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 6688)
@@ -92,5 +92,5 @@
 		[Category("CKEditor Basic Settings")]
 		[Description("The height of editing area( content ), in relative or absolute, e.g. 30px, 5em. Note: Percentage unit is not supported yet.e.g. 30%.")]
-		[DefaultValue("200")]
+		[DefaultValue(typeof(System.Web.UI.WebControls.Unit), "200px")]
 		public override Unit Height
 		{
@@ -121,5 +121,5 @@
 		[Category("CKEditor Basic Settings")]
 		[Description("The editor width in CSS size format or pixel integer.")]
-		[DefaultValue("100%")]
+		[DefaultValue(typeof(System.Web.UI.WebControls.Unit), "100%")]
 		public override Unit Width
 		{
@@ -481,5 +481,5 @@
 		[Category("CKEditor Other Settings")]
 		[Description("List of classes to use for indenting the contents. If it's null, no classes will be used and instead the #indentUnit and #indentOffset properties will be used.")]
-		[DefaultValue("")]
+		[DefaultValue(typeof(Array), null)]
 		public string[] IndentClasses { get { return config.indentClasses; } set { config.indentClasses = value; } }
 
@@ -528,16 +528,6 @@
 		[Category("CKEditor Other Settings")]
 		[Description("List of regular expressions to be executed over the input HTML, indicating HTML source code that matched must not present in WYSIWYG mode for editing.")]
-		[DefaultValue("")]
-		public string[] ProtectedSource
-		{
-			get
-			{
-				string[] retVal = new string[config.protectedSource.Length];
-				try { retVal = (string[])config.protectedSource; }
-				catch { }
-				return retVal;
-			}
-			set { config.protectedSource = value; }
-		}
+		[DefaultValue(typeof(Array), null)]
+		public string[] ProtectedSource { get { return config.protectedSource; } set { config.protectedSource = value; } }
 
 		[Category("CKEditor Other Settings")]