diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index af6b0fad..9c8a807c 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -111,7 +111,7 @@ namespace VEPROMS
 				//use local data (for development/debug mode)
 				if (Environment.MachineName == "RMARK-PC")
 					VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEBUG";
-                else if (Environment.UserName == "BODINE")
+                else if (Environment.UserName.ToUpper() == "BODINE")
                     VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_BODINE_DEBUG";
                 else
 					VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_LOCAL";
diff --git a/PROMS/Volian.Controls.Library/GridItem.cs b/PROMS/Volian.Controls.Library/GridItem.cs
index 5ba91ede..5eff46dc 100644
--- a/PROMS/Volian.Controls.Library/GridItem.cs
+++ b/PROMS/Volian.Controls.Library/GridItem.cs
@@ -371,8 +371,11 @@ namespace Volian.Controls.Library
 					CellRange cr = MyFlexGrid.GetMergedRange(r, c);
 					if (cr.r1 == r && cr.c1 == c)
 					{
-						myRTB.Rtf = MyFlexGrid.GetCellRTFString(r, c);
-
+						string rtf = MyFlexGrid.GetCellRTFString(r, c);
+						if (rtf.StartsWith(@"{\rtf"))
+							myRTB.Rtf = rtf;
+						else
+							myRTB.Text = rtf;// RHM 20110214 This should not happen
 						//string strp = DisplayText.StaticStripRtfCommands((string)MyFlexGrid[r, c]);   // probably still need to remove link stuff
 						//strp = StepRTB.RemoveLinkComments(strp);
 						sb.Append(myRTB.Text.Replace(@"\r\n", " "));  //  strp.Replace(@"\r\n", " "));