diff --git a/CASA.changes b/CASA.changes
index af527c0f..c9e15aaa 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu May  4 15:23:17 IST 2006 - smanojna@novell.com
+
+- Description:
+  1. Added dialog-modal property for change master password dialog.
+  2. Added delete dialog handler for master password prompt dialog
+     during unlock store.
+
+- Modified files:
+  c_gui/images/casa.glade
+  c_gui/CommonGUI.cs
+
 -------------------------------------------------------------------
 Thu May  4 09:36:04 IST 2006 - smanojna@novell.com
 - Description:
diff --git a/c_gui/CommonGUI.cs b/c_gui/CommonGUI.cs
index 32c99af2..e63fc62b 100644
--- a/c_gui/CommonGUI.cs
+++ b/c_gui/CommonGUI.cs
@@ -77,17 +77,17 @@ namespace Novell.CASA.GUI
 			Glade.XML gxmlTemp = new Glade.XML ("../images/casa.glade", "dialogLogin", null);
 #endif
 #if LINUX
-				Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogLogin", null);				
+			Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogLogin", null);				
 #endif
 
 			gxmlTemp.Autoconnect (this);
-			//dialogLogin.TransientFor = windowMain;        
+			dialogLogin.TransientFor = (Gtk.Window)CasaMain.gxmlMain.GetWidget("windowMain");;        
 				
-			label86.Text = "Enter your Master Password to unlock your secrets";
+			label86.Text = "Enter your Master Password to unlock your secrets.";
 			entryMasterPassword3.Text="";
 			label88.Hide();
 			entryMasterPassword4.Hide();			
-			dialogLogin.SetPosition(Gtk.WindowPosition.Center);
+			//dialogLogin.SetPosition(Gtk.WindowPosition.Center);
 			dialogLogin.Destroyed += new EventHandler(dialogLogin_Destroyed);
 			dialogLogin.Show();	
 		}
@@ -176,7 +176,8 @@ namespace Novell.CASA.GUI
     
 		public void OnDialogLoginDeleted(object obj, DeleteEventArgs args) 
 		{		    			
-			args.RetVal = true;        		
+			dialogLogin.Destroy();
+			args.RetVal = true;
 		}
     
 		public void on_entryMasterPassword3_activate(object obj, EventArgs args)
diff --git a/c_gui/images/casa.glade b/c_gui/images/casa.glade
index b087eead..9ffd20cc 100644
--- a/c_gui/images/casa.glade
+++ b/c_gui/images/casa.glade
@@ -7059,7 +7059,7 @@ and try running CASAManager again.</property>
   <property name="title" translatable="yes">Master Password</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="icon">CASAicons.ico</property>
@@ -7838,31 +7838,31 @@ prompted for the Master Password at startup.</property>
 	      <property name="padding">0</property>
 	      <property name="expand">True</property>
 	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="labelDesktopPasswordMessage">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>	      
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="labelDesktopPasswordMessage">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="use_markup">True</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
 	    </packing>
 	  </child>
 
@@ -10886,7 +10886,7 @@ Value:</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Firefox - Master Password</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
   <property name="modal">True</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">True</property>