diff --git a/CASA/CASA.changes b/CASA/CASA.changes
index 8021740d..9561e1be 100644
--- a/CASA/CASA.changes
+++ b/CASA/CASA.changes
@@ -1,3 +1,7 @@
+Thu May 29 09:38:53 MDT 2008 - jnorman@novell.com
+
+- Fix bug that prevents CASAManager from displaying
+
 -------------------------------------------------------------------
 Mon May 11 11:38:53 MDT 2008 - jnorman@novell.com
 
diff --git a/CASA/gui/CasaMain.cs b/CASA/gui/CasaMain.cs
index 2fc47a1e..9fac3d6e 100644
--- a/CASA/gui/CasaMain.cs
+++ b/CASA/gui/CasaMain.cs
@@ -114,29 +114,29 @@ namespace Novell.CASA.GUI
 						
 		[Glade.Widget] 
 		Gtk.Button		okbuttonPersistentStorage,
-						buttonChooseDirectory;
-
-        [Glade.Widget]
-        Gtk.MenuItem mmiNew,
-                        mmiNewKey,
-                        mmiImportSecrets,
-                        mmiExportSecrets,
-                        mmiView,
-                        mmiLink,
-                        mmiCopy,
-                        mmiDelete,
-                        mmiRefresh,
-                        mmiLockSecrets,
-                        mmiUnlockSecrets,
-                        mmiDestroySecrets,
-                        mmiEdit,
-                        mmiOptions,
-                        mmiDebug,
-                        mmiApplicationSSO,
-                        mmiKonquerer,
-                        mmiKopete,
-                        mmiNetworkManager,
-                        mmiGaim,
+						buttonChooseDirectory;
+
+        [Glade.Widget]
+        Gtk.MenuItem mmiNew,
+                        mmiNewKey,
+                        mmiImportSecrets,
+                        mmiExportSecrets,
+                        mmiView,
+                        mmiLink,
+                        mmiCopy,
+                        mmiDelete,
+                        mmiRefresh,
+                        mmiLockSecrets,
+                        mmiUnlockSecrets,
+                        mmiDestroySecrets,
+                        mmiEdit,
+                        mmiOptions,
+                        mmiDebug,
+                        mmiApplicationSSO,
+                        mmiKonquerer,
+                        mmiKopete,
+                        mmiNetworkManager,
+                        mmiGaim,
                         mmiChangeMP;
 		
 		[Glade.Widget] 
@@ -366,15 +366,15 @@ namespace Novell.CASA.GUI
 			else
 				(notebookStores.GetNthPage(Common.STORE_GNOMEKEYRING)).Visible = Common.IS_GNOMEKEYRING;	      
         		
-			notebookStores.CurrentPage = Common.STORE_MICASA;
-
-            if (CommonGUI.UseMasterPassword())
-            {
-                mmiChangeMP.Visible = true;
-            }
-            else
-            {
-                mmiChangeMP.Visible = false;
+			notebookStores.CurrentPage = Common.STORE_MICASA;
+
+            if (CommonGUI.UseMasterPassword())
+            {
+                mmiChangeMP.Visible = true;
+            }
+            else
+            {
+                mmiChangeMP.Visible = false;
             }
 
 
@@ -404,12 +404,11 @@ namespace Novell.CASA.GUI
                 {
                     Glade.XML gxmlTemp = new Glade.XML(Common.GladeFile, "dialogDesktopPassword", null);
                     gxmlTemp.Autoconnect(this);
+						  return;
                 }
             }
-            else
-            {
-                InitializeGUI();
-            }                     
+            
+            InitializeGUI();                     
         }       
         
 		/// <summary>
@@ -509,15 +508,15 @@ namespace Novell.CASA.GUI
 						}
 
 						if (dialogDesktopPassword != null)
-							dialogDesktopPassword.Destroy();
-
-                        if (CommonGUI.UseMasterPassword())
-                        {
-                            MasterPasswordAuthentication();
-                        }
-                        else
-                        {
-                            InitializeGUI();
+							dialogDesktopPassword.Destroy();
+
+                        if (CommonGUI.UseMasterPassword())
+                        {
+                            MasterPasswordAuthentication();
+                        }
+                        else
+                        {
+                            InitializeGUI();
                         }
 					}
 					else