diff --git a/casa-yast/src/complex.ycp b/casa-yast/src/complex.ycp
index c7afb799..7d6f9466 100644
--- a/casa-yast/src/complex.ycp
+++ b/casa-yast/src/complex.ycp
@@ -112,20 +112,25 @@ any SummaryDialog()
 		`VSpacing(),
 		`VSpacing()
 		));
+		
 
 	Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"",
 	    Label::BackButton(), Label::FinishButton());
 
+	UI::ChangeWidget(`id(`install_casa_button), `Enabled, false);
+	UI::ChangeWidget(`id(`uninstall_casa_button), `Enabled, false);
+
+
        	integer iConfig_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/iscasaconfiged");
 
 	if(iConfig_CASAReturn == 0)
 	{
-		UI::ChangeWidget(`id(`install_casa_button), `Enabled, false);
+		UI::ChangeWidget(`id(`uninstall_casa_button), `Enabled, true);
 	
 	}
 	else
 	{
-		UI::ChangeWidget(`id(`uninstall_casa_button), `Enabled, false);
+		UI::ChangeWidget(`id(`install_casa_button), `Enabled, true);
 	}
 
 	any ret = nil;
diff --git a/casa-yast/yast2-CASA.changes b/casa-yast/yast2-CASA.changes
index ce767acc..ec69e440 100644
--- a/casa-yast/yast2-CASA.changes
+++ b/casa-yast/yast2-CASA.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 25 10:19:39 MDT 2006 - cmashayekhi@novell.com
+
+- Buttons start in grayed out state before internal check
+  for insattation or not.
+
 -------------------------------------------------------------------
 Mon May 22 14:10:16 MDT 2006 - cmashayekhi@novell.com