diff --git a/CASA.changes b/CASA.changes
index cf942303..c6c71666 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri May  5 17:51:27 IST 2006 - smanojna@novell.com
+
+- Description:
+  Bug 152929: Secret with special characters in name causing
+  unexpected behaviour. This fix will only prevent the 
+  following special characters * : ' \ & = < >
+
+- Modified files:
+  c_gui/Common.cs
+  c_gui/images/casa.glade
+
 -------------------------------------------------------------------
 Fri May  5 10:25:10 IST 2006 - smanojna@novell.com
  
diff --git a/c_gui/Common.cs b/c_gui/Common.cs
index 5baafe52..a1c6c319 100644
--- a/c_gui/Common.cs
+++ b/c_gui/Common.cs
@@ -61,16 +61,16 @@ public class Common
  
  	public static int 	 	MAX_LEN 	= 512;
  	
- 	//static Char[] SpecialCharacters = new Char[]{ '*' };
+ 	static Char[] SpecialCharacters = new Char[]{ '*', ':', '\'', '\\', '&', '=', '<', '>' };
  	
- 	static Char[] SpecialCharacters = new Char[]{ '`', '~', '@', '#', '$', '%', 
+ 	/*static Char[] SpecialCharacters = new Char[]{ '`', '~', '@', '#', '$', '%', 
  												   '^', '&', '*', '(', ')', 
  												   '_', '=', '+', '|', '\\', 
  												   '{', '}', '[', ']', ':', 
  												   ';', '\"', '\'', '<', '>', 
  												   ',', '.', '?', '/', '!'};
  	
- 	
+ 	*/
   	///##############################################################
   	/// SPI CONSTANTS
   	///
diff --git a/c_gui/images/casa.glade b/c_gui/images/casa.glade
index aa0731b1..5b6f0ff2 100644
--- a/c_gui/images/casa.glade
+++ b/c_gui/images/casa.glade
@@ -5068,7 +5068,9 @@ Jim Norman
 Poorna Pushkala
 Ahmed SK Anis
 Manohar Mathias
-CSL Manojna&lt;/b&gt;</property>
+CSL Manojna
+Nagareshwar Talekar
+L Sreevatsa&lt;/b&gt;</property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">True</property>
 			      <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -11273,7 +11275,9 @@ password to view the secrets.</property>
 	      <child>
 		<widget class="GtkLabel" id="label255">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Secret ID, Key and Value names cannot have these special characters.&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">&lt;b&gt;The Secret ID and Key names may only contain 
+the following characters 
+0-9, a-z, A-Z, and any of ~!@#$%^()_+-[]{};&quot;,./?&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -11298,8 +11302,7 @@ password to view the secrets.</property>
 	      <child>
 		<widget class="GtkLabel" id="label256">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Special characters:
-~!@#$%^&amp;*()_+=[]{}|\;':&quot;&lt;&gt;,.?/</property>
+		  <property name="label" translatable="yes">Avoid using these special characters for Secret ID and Key names * : ' \ &amp; = &lt; &gt;</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>