diff --git a/c_adlib/ad_ff/FireFox.cs b/c_adlib/ad_ff/FireFox.cs
index a688cc3c..32999b03 100644
--- a/c_adlib/ad_ff/FireFox.cs
+++ b/c_adlib/ad_ff/FireFox.cs
@@ -260,7 +260,7 @@ public class HostElement
                 			methodStatusCode = FPM_GetSignonData(profileName,out hostListIntPtr,LOAD_PROFILE_ALWAYSFROM_FILE);
                 			if( 1 != methodStatusCode )
 					{
- 						Console.WriteLine("FireFox:Getting Data for profile Failed with error "+methodStatusCode);
+ 						//Console.WriteLine("FireFox:Getting Data for profile Failed with error "+methodStatusCode);
 						hostList=null;
 						return hostList;
 					}  	
diff --git a/c_adlib/ad_ff/native/Common.cpp b/c_adlib/ad_ff/native/Common.cpp
index 0a8b2abb..26d4fd77 100644
--- a/c_adlib/ad_ff/native/Common.cpp
+++ b/c_adlib/ad_ff/native/Common.cpp
@@ -17,8 +17,10 @@ void PrintMessage( int level, char *mesg , ...)
 #ifdef DEBUG
 		printf("%s", lastErrorMesg );	
 #else	
-	if( level != MESG_DEBUG )
-		printf("%s", lastErrorMesg );
+	if( level != MESG_DEBUG )
+	{
+		//printf("%s", lastErrorMesg );
+	}
 #endif
 
 }
diff --git a/c_adlib/ad_gk/native/ad_gk.c b/c_adlib/ad_gk/native/ad_gk.c
index 0f705b88..27e7a92c 100644
--- a/c_adlib/ad_gk/native/ad_gk.c
+++ b/c_adlib/ad_gk/native/ad_gk.c
@@ -578,7 +578,7 @@ OperationCompletedCb  (GnomeKeyringResult result,
         gpointer           data)
 {
         OperationCompleted *cbData = (OperationCompleted *)data;
-        g_print ("ad_gk.c : Operation %s Completed %d\n", cbData->OperationName, result);
+        //g_print ("ad_gk.c : Operation %s Completed %d\n", cbData->OperationName, result);
         cbData->result = result;
         g_main_loop_quit (loop);
 }
@@ -589,10 +589,10 @@ CreateItemCb  (GnomeKeyringResult result,
                 gpointer           data)
 {
         OperationCompleted *cbData = (OperationCompleted *)data;
-        g_print ("ad_gk.c : CreateItemCb : created item: res: %d id: %d\n", result, id);
+        //g_print ("ad_gk.c : CreateItemCb : created item: res: %d id: %d\n", result, id);
     	if (result != GNOME_KEYRING_RESULT_OK)
     	{
-        	g_print ("ad_gk.c : CreateItemCb : Unable to create item : %d\n", result);
+        //g_print ("ad_gk.c : CreateItemCb : Unable to create item : %d\n", result);
 	}
         cbData->result = result;
         g_main_loop_quit (loop);
@@ -679,7 +679,7 @@ void ListKeyringsCb (GnomeKeyringResult result,
 
     if (result != GNOME_KEYRING_RESULT_OK) 
     {
-        g_print ("Unable to get keyring list -  %d\n", result);
+        //g_print ("Unable to get keyring list -  %d\n", result);
     } 
     else 
     {
@@ -700,7 +700,7 @@ void KeyringGetInfoCb(GnomeKeyringResult result,
     KeyringInfo *retInfo = cbData->info;
     if (result != GNOME_KEYRING_RESULT_OK) 
     {
-        g_print ("Unable to get keyring info %d\n", result);
+        //g_print ("Unable to get keyring info %d\n", result);
     }
     else
     {
@@ -724,7 +724,7 @@ void ListItemCb( GnomeKeyringResult result,
 
     if (result != GNOME_KEYRING_RESULT_OK)
     {
-        g_print ("Unable to get list of items : %d\n", result);
+        //g_print ("Unable to get list of items : %d\n", result);
     }
     else
     {
@@ -742,7 +742,7 @@ void ItemGetInfoCb( GnomeKeyringResult result,
     ItemInfo *itemInfo = cbData->info;
     if (result != GNOME_KEYRING_RESULT_OK) 
     {
-        g_print ("Unable to get Item info: %d\n", result);
+        //g_print ("Unable to get Item info: %d\n", result);
     } 
     else 
     {
@@ -772,7 +772,7 @@ void ItemGetAttributesCb(GnomeKeyringResult result,
     
     if( result != GNOME_KEYRING_RESULT_OK )
     {
-        g_print("Unable to get the attributes of item\n");
+        //g_print("Unable to get the attributes of item\n");
     }
     else
     {
diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs
index 39965afb..69c1bb6a 100644
--- a/c_gui/CasaMain.cs
+++ b/c_gui/CasaMain.cs
@@ -659,7 +659,7 @@ namespace Novell.CASA.GUI
 				case Common.STORE_MICASA: 				 
 					break;
     										
-				case Common.STORE_FIREFOX:	
+				case Common.STORE_FIREFOX:
 					if( false == objFirefox.IS_STORE_AGGREGATED )
 					{
 						if( StoreDataInterface.IsMasterPasswordSet(Common.STORE_FIREFOX) )
@@ -697,7 +697,12 @@ namespace Novell.CASA.GUI
 					break;
 			}
 		}
-	
+		
+		public void on_entryFirefoxMP_activate(object obj, EventArgs args)
+		{
+			on_buttonFirefoxMPok_clicked(obj, args);
+		}
+		
 		public void on_buttonFirefoxMPok_clicked(object obj, EventArgs args)
 		{
 			if( "" != entryFirefoxMP.Text )
@@ -956,7 +961,7 @@ namespace Novell.CASA.GUI
     	
 			if( Common.IS_FIREFOX )
 			{
-				if( false == objFirefox.IS_STORE_AGGREGATED )
+				if( false == objFirefox.IS_STORE_AGGREGATED && notebookStores.CurrentPage == Common.STORE_FIREFOX )
 				{
 					if( StoreDataInterface.IsMasterPasswordSet(Common.STORE_FIREFOX) )
 					{
@@ -968,6 +973,8 @@ namespace Novell.CASA.GUI
 				}
 				else
 					objFirefox.AggregateStore();
+				//if( true == objFirefox.IS_STORE_AGGREGATED )
+				//	objFirefox.AggregateStore();
 			}
 			
 			if( Common.IS_MOZILLA )
diff --git a/c_gui/images/casa.glade b/c_gui/images/casa.glade
index 6d4e60e0..c05b955a 100644
--- a/c_gui/images/casa.glade
+++ b/c_gui/images/casa.glade
@@ -10946,6 +10946,7 @@ password to view the secrets.</property>
 			  <property name="has_frame">True</property>
 			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
+			  <signal name="activate" handler="on_entryFirefoxMP_activate" last_modification_time="Thu, 09 Mar 2006 04:22:28 GMT"/>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>