diff --git a/CASA.changes b/CASA.changes
index 8025e03e..168820a8 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar  9 10:53:02 IST 2006 - smanojna@novell.com
+
+- Added a delete-event-handler for the Firefox master password
+  prompt dialog.
+- A minor fix to make CASAManager always write to the default wallet.
+- Removed console debug print messages from GK and FF code.
+
 -------------------------------------------------------------------
 Wed Mar  8 18:46:13 IST 2006 - lsreevatsa@novell.com
 
diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs
index 69c1bb6a..a3cbbdf5 100644
--- a/c_gui/CasaMain.cs
+++ b/c_gui/CasaMain.cs
@@ -668,6 +668,7 @@ namespace Novell.CASA.GUI
 							gxmlTemp.Autoconnect (this);
 							dialogFirefoxMP.SetPosition(Gtk.WindowPosition.CenterOnParent);
 							dialogFirefoxMP.TransientFor = windowMain;
+							dialogFirefoxMP.DeleteEvent += new DeleteEventHandler(on_dialogFirefoxMP_deleted);
 						}
 						else
 						{
@@ -728,7 +729,11 @@ namespace Novell.CASA.GUI
 		{
 		
 		}
-	
+		
+		public void on_dialogFirefoxMP_deleted(object obj, DeleteEventArgs args) 
+		{
+			dialogFirefoxMP.Destroy();
+		}
 		/// <summary>
 		/// ********************************************************************
 		/// internal void FileMenuActivated(object obj, EventArgs args)
@@ -969,6 +974,7 @@ namespace Novell.CASA.GUI
 						gxmlTemp.Autoconnect (this);
 						dialogFirefoxMP.SetPosition(Gtk.WindowPosition.CenterOnParent);
 						dialogFirefoxMP.TransientFor = windowMain;
+						dialogFirefoxMP.DeleteEvent += new DeleteEventHandler(on_dialogFirefoxMP_deleted);
 					}
 				}
 				else
diff --git a/c_gui/images/casa.glade b/c_gui/images/casa.glade
index c05b955a..7640c6e0 100644
--- a/c_gui/images/casa.glade
+++ b/c_gui/images/casa.glade
@@ -10700,7 +10700,6 @@ Value:</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">True</property>
-  <signal name="delete_event" handler="OnDialogLoginDeleted" last_modification_time="Tue, 06 Sep 2005 13:51:23 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="vbox136">