diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs
index 99cdad6c..8b5e9721 100644
--- a/c_gui/CasaMain.cs
+++ b/c_gui/CasaMain.cs
@@ -1158,9 +1158,9 @@ namespace Novell.CASA.GUI
 			dialogPreferences.TransientFor = windowMain;		
 			checkbuttonFirefox.Active=Common.IS_FIREFOX;
 			checkbuttonMozilla.Active=Common.IS_MOZILLA;
-			checkbuttonGnomeKeyring.Active=Common.IS_GNOMEKEYRING;
-			checkbuttonKdeWallet.Active=Common.IS_KDEWALLET;
-
+			checkbuttonGnomeKeyring.Active=checkbuttonGnomeKeyring.Sensitive=Common.IS_GNOMEKEYRING;
+			checkbuttonKdeWallet.Active=checkbuttonKdeWallet.Sensitive=Common.IS_KDEWALLET;
+						
 			if (Common.IS_WINDOWS)
 			{
 				checkbuttonGnomeKeyring.Sensitive = false;
diff --git a/c_gui/StorePolicyInterface.cs b/c_gui/StorePolicyInterface.cs
index 51e49b67..172d5d01 100644
--- a/c_gui/StorePolicyInterface.cs
+++ b/c_gui/StorePolicyInterface.cs
@@ -26,6 +26,7 @@ namespace Novell.CASA.GUI {
 	using System;
 	using System.Collections;
 	using Novell.CASA.CASAPolicy;
+	using Novell.CASA.DataEngines;
 	using Novell.CASA;
 
 
@@ -77,14 +78,14 @@ namespace Novell.CASA.GUI {
 			
 			while( enumerator.MoveNext() )
 			{				
-				if( ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_KDEWALLET) )
+				if( ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_KDEWALLET) && true == IsStoreAvailable(Common.STORENAME_KDEWALLET))
 				{
 					Common.IS_KDEWALLET = true;
 					storeNameKwallet = ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName;
 					storeIdKwallet[kWalletStoreCounter++] = ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreId;					
 					Logger.DbgLog("GUI:StorePolicyInterface.Init() - miCASA policy = " + Common.IS_MICASA);
 				}
-				else if(((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_GNOMEKEYRING))
+				else if(((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_GNOMEKEYRING) && true == IsStoreAvailable(Common.STORENAME_GNOMEKEYRING))
 				{
 					Common.IS_GNOMEKEYRING=true;
 					storeNameGkeyring=((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName;