diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs
index 605153c3..fc9b728d 100644
--- a/c_gui/CasaMain.cs
+++ b/c_gui/CasaMain.cs
@@ -558,8 +558,7 @@ namespace Novell.CASA.GUI
 						mmiNew.Sensitive = mmiNewKey.Sensitive = true;
 					}
 					else
-					{
-						//mmiNew.Sensitive = true;
+					{						
 						mmiNewKey.Sensitive = false;						
 					}
 					break;
@@ -586,6 +585,7 @@ namespace Novell.CASA.GUI
 					{
 						//mmiNew.Sensitive = mmiNewKey.Sensitive = true;
 						mmiNew.Sensitive = true;
+						mmiNewKey.Sensitive = false;						
 					}
 					else
 					{
diff --git a/c_gui/GnomeKeyring.cs b/c_gui/GnomeKeyring.cs
index b7b61e90..db9de299 100644
--- a/c_gui/GnomeKeyring.cs
+++ b/c_gui/GnomeKeyring.cs
@@ -199,9 +199,9 @@ public class GnomeKeyring : Store
 				menuRightClick.Popup(null, null, null, IntPtr.Zero, 3, Gtk.Global.CurrentEventTime);
 				
 				if( 0 != tvSecretIDGnomeKeyring.Selection.CountSelectedRows() )
-					cmiLink.Sensitive = cmiCopy.Sensitive = false;
+					cmiNewKey.Sensitive = cmiLink.Sensitive = cmiCopy.Sensitive = false;
 				else
-					cmiNewSecret.Sensitive = cmiNewKey.Sensitive = cmiView.Sensitive = cmiLink.Sensitive = cmiCopy.Sensitive = cmiDelete.Sensitive = false;
+					cmiNewKey.Sensitive = cmiView.Sensitive = cmiLink.Sensitive = cmiCopy.Sensitive = cmiDelete.Sensitive = false;
 			}	
 			catch(Exception exp)
 			{
@@ -642,6 +642,7 @@ public class GnomeKeyring : Store
 		tvKeyValue.AppendColumn("Linked",new CellRendererText(),"text",4);
 		tvKeyValue.Model = tsKeyValue;		
 		tsKeyValue.Clear();
+		tsKeyValue.AppendValues("GKPassword", "novell", "********", true, "No");		
 		entrySecretID.HasFocus = true;
 		entrySecretID.Text = "";
 		
diff --git a/c_gui/KdeWallet.cs b/c_gui/KdeWallet.cs
index 6788f605..5b26e28e 100644
--- a/c_gui/KdeWallet.cs
+++ b/c_gui/KdeWallet.cs
@@ -195,7 +195,7 @@ public class KdeWallet : Store
 				if( 0 != tvSecretIDKdeWallet.Selection.CountSelectedRows() )
 					cmiLink.Sensitive = cmiCopy.Sensitive = false;
 				else
-					cmiNewSecret.Sensitive = cmiNewKey.Sensitive = cmiView.Sensitive = cmiLink.Sensitive = cmiCopy.Sensitive = cmiDelete.Sensitive = false;
+					cmiNewKey.Sensitive = cmiView.Sensitive = cmiLink.Sensitive = cmiCopy.Sensitive = cmiDelete.Sensitive = false;
 			}	
 			catch(Exception exp)
 			{