diff --git a/CASA/gui/CasaMain.cs b/CASA/gui/CasaMain.cs
index ae8b6598..947779a1 100644
--- a/CASA/gui/CasaMain.cs
+++ b/CASA/gui/CasaMain.cs
@@ -103,8 +103,8 @@ namespace Novell.CASA.GUI
 						checkbuttonKdeWallet,
 						checkbuttonCloseMessage,
 						checkbuttonRunInTray,
-						checkbuttonSaveSecrets,
-						checkbuttonDecrypt;						
+						checkbuttonSaveSecrets;
+												
 						
 		[Glade.Widget] 
 		Gtk.Label		label88,
@@ -1650,8 +1650,7 @@ namespace Novell.CASA.GUI
 
 			radiobutton1.Active = config.GetConfigSetting(Common.CONFIG_DISPLAY_CASA_MANAGER, true);
 			radiobutton2.Active = !config.GetConfigSetting(Common.CONFIG_DISPLAY_CASA_MANAGER, true);
-
-			checkbuttonDecrypt.Active = config.GetConfigSetting(Common.CONFIG_DECRYPT_USING_DESKTOP_PASS, true);
+			
 			checkbuttonSaveSecrets.Active = config.GetConfigSetting(Common.CONFIG_PERSIST_SECRETS, true);
 			
 			if (Common.IS_WINDOWS)
@@ -1717,14 +1716,12 @@ namespace Novell.CASA.GUI
 			if (checkbuttonSaveSecrets.Active)
 			{
 				entryStorageDirectory.Sensitive = true;
-				buttonChooseDirectory.Sensitive = true;
-				checkbuttonDecrypt.Sensitive = true;
+				buttonChooseDirectory.Sensitive = true;				
 			}
 			else
 			{
 				entryStorageDirectory.Sensitive = false;
-				buttonChooseDirectory.Sensitive = false;
-				checkbuttonDecrypt.Sensitive = false;
+				buttonChooseDirectory.Sensitive = false;				
 			}
 		}
 
@@ -1808,7 +1805,7 @@ namespace Novell.CASA.GUI
 
 			// update persistent policy settings
 			config.SetConfigSetting(Common.CONFIG_PERSIST_SECRETS, checkbuttonSaveSecrets.Active);
-			config.SetConfigSetting(Common.CONFIG_DECRYPT_USING_DESKTOP_PASS, checkbuttonDecrypt.Active);
+			
 
 			// delete .miCASA file if not peristing
 			if (!checkbuttonSaveSecrets.Active)
diff --git a/CASA/gui/images/casa.glade b/CASA/gui/images/casa.glade
index c0a12884..c06c764f 100644
--- a/CASA/gui/images/casa.glade
+++ b/CASA/gui/images/casa.glade
@@ -4528,76 +4528,6 @@ prompted for the Master Password at startup.</property>
 			</packing>
 		      </child>
 
-		      <child>
-			<widget class="GtkHBox" id="hbox98">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label282">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">      </property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</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="GtkVBox" id="vbox167">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkCheckButton" id="checkbuttonDecrypt">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Decypt and open miCASA using my workstation password</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">True</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
 		      <child>
 			<widget class="GtkHBox" id="hbox92">
 			  <property name="visible">True</property>