diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs
index 208c5bf8..2db31176 100644
--- a/c_gui/CasaMain.cs
+++ b/c_gui/CasaMain.cs
@@ -179,14 +179,16 @@ namespace Novell.CASA.GUI
 				}
 				else
 				{
-					if (Common.IS_LINUX)
+					// NOTE: Until we can figure out how to run YAST as root from here.
+					//if (Common.IS_LINUX)
+					if (false)
 					{
 						message = "CASA services are not available.\r\n\r\nConfigure CASA using YAST?";
 						buttonType = Gtk.ButtonsType.YesNo;
 					}
 					else
 					{
-						message = "CASA services are not available";
+						message = "CASA services are not available.\r\n\r\nPlease contact your adminstrator to configure CASA.";
 					}
 				}									
 								
@@ -417,25 +419,35 @@ namespace Novell.CASA.GUI
 
                 if (entryDesktopPassword1.Text.Equals(entryDesktopPassword2.Text))
                 {
-                    // set the desktop password in micasa
-                    try
-                    {
-                        Novell.CASA.miCASA.SetCredential(0,
-                        "Desktop",
-                        null,
-                        Novell.CASA.miCASA.USERNAME_TYPE_CN_F,
-                        GetLocalUsername(),
-                        entryDesktopPassword1.Text);
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.DbgLog(e.ToString());
-                    }
 
-                    if (dialogDesktopPassword != null)
-                        dialogDesktopPassword.Destroy();
+					// validate entered desktop password
+					if (miCASA.ValidateDesktopPwd(entryDesktopPassword1.Text))
+					{
+						// set the desktop password in micasa
+						try
+						{
+							Novell.CASA.miCASA.SetCredential(0,
+								"Desktop",
+								null,
+								Novell.CASA.miCASA.USERNAME_TYPE_CN_F,
+								GetLocalUsername(),
+								entryDesktopPassword1.Text);
+						}
+					
+						catch (Exception e)
+						{
+							Logger.DbgLog(e.ToString());
+						}
 
-                    MasterPasswordAuthentication();
+						if (dialogDesktopPassword != null)
+							dialogDesktopPassword.Destroy();
+
+						MasterPasswordAuthentication();
+					}
+					else
+					{
+						labelDesktopPasswordMessage.Text = "Your desktop password does not match";
+					}
                 }
                 else
                 {
diff --git a/c_gui/images/casa.glade b/c_gui/images/casa.glade
index a7d960ea..b087eead 100644
--- a/c_gui/images/casa.glade
+++ b/c_gui/images/casa.glade
@@ -7838,6 +7838,31 @@ prompted for the Master Password at startup.</property>
 	      <property name="padding">0</property>
 	      <property name="expand">True</property>
 	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="labelDesktopPasswordMessage">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">True</property>
+	      <property name="use_markup">True</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>