diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index d79c2f17..1ea5f753 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -151,6 +151,8 @@ 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.MachineName == "WINDOWS7-RHM")
+					VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEBUG";
                 else if (Environment.UserName.ToUpper() == "BODINE")
                     VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_BODINE_DEBUG";
                 else
@@ -162,6 +164,8 @@ namespace VEPROMS
 				// - except for the volian laptop and Rich's Demo version where we need to use local data
 				if (Environment.MachineName == "RMARK-PC")
 					VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEMO";
+ 				else if (Environment.MachineName == "WINDOWS7-RHM")
+					VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEMO";
                 else if (Environment.UserName.ToUpper() == "BODINE")
                     VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_BODINE_DEMO";
                 else
@@ -836,6 +840,7 @@ namespace VEPROMS
 			//  btnAdmin.Visible = false;
 			StepTabRibbon.PasteNoReturnsSetting = Properties.Settings.Default.PasteNoReturns;
 			StepTabRibbon.PastePlainTextSetting = Properties.Settings.Default.PastePlainText;
+            Activate();
 		}
 
 		void tmrCloseTabItems_Tick(object sender, EventArgs e)