diff --git a/MatterControlLib/PartPreviewWindow/PartPreviewContent.cs b/MatterControlLib/PartPreviewWindow/PartPreviewContent.cs
index d5c9fec6f..661560b7c 100644
--- a/MatterControlLib/PartPreviewWindow/PartPreviewContent.cs
+++ b/MatterControlLib/PartPreviewWindow/PartPreviewContent.cs
@@ -259,10 +259,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				});
 
 			tabControl.AddTab(
-				new ChromeTab("Inventory", "Hardware".Localize(), tabControl, new InventoryTabPage(theme), theme, hasClose: false)
+				new ChromeTab("Hardware", "Hardware".Localize(), tabControl, new InventoryTabPage(theme), theme, hasClose: false)
 				{
 					MinimumSize = new Vector2(0, theme.TabButtonHeight),
-					Name = "Library Tab",
+					Name = "Hardware Tab",
 					Padding = new BorderDouble(15, 0)
 				});
 
diff --git a/MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs b/MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
index e611ddd00..c9e319ef9 100644
--- a/MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
+++ b/MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
@@ -99,7 +99,8 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 			contentRow.AddChild(printerModelContainer);
 			contentRow.AddChild(createPrinterNameContainer());
 
-			if (ApplicationController.GuestUserActive())
+			bool userIsLoggedIn = !ApplicationController.GuestUserActive?.Invoke() ?? false;
+			if (userIsLoggedIn)
 			{
 				var signInRow = new FlowLayoutWidget()
 				{
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index 7d958bedd..fbbae2597 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -170,7 +170,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 		public static void WaitForFirstDraw(this AutomationRunner testRunner)
 		{
-			testRunner.GetWidgetByName("Start Tab", out SystemWindow systemWindow, 10);
+			testRunner.GetWidgetByName("WidescreenPanel", out SystemWindow systemWindow, 10);
 			// make sure we wait for MC to be up and running
 			testRunner.WaitforDraw(systemWindow);
 		}
@@ -219,7 +219,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 		public static Emulator LaunchAndConnectToPrinterEmulator(this AutomationRunner testRunner, string make = "Airwolf 3D", string model = "HD", bool runSlow = false)
 		{
 			SystemWindow systemWindow;
-			testRunner.GetWidgetByName("Start Tab", out systemWindow, 10);
+			testRunner.GetWidgetByName("Hardware Tab", out systemWindow, 10);
 			// make sure we wait for MC to be up and running
 			testRunner.WaitforDraw(systemWindow);
 
@@ -318,17 +318,17 @@ namespace MatterHackers.MatterControl.Tests.Automation
 		public static void AddAndSelectPrinter(this AutomationRunner testRunner, string make, string model)
 		{
 			SystemWindow systemWindow;
-			testRunner.GetWidgetByName("Start Tab", out systemWindow, 10);
+			testRunner.GetWidgetByName("WidescreenPanel", out systemWindow, 10);
 			// make sure we wait for MC to be up and running
 			testRunner.WaitforDraw(systemWindow);
 
-			// If SelectMake is not visible and the ConnectionWizard is, click Skip
+			// Click 'Add Printer' if not on screen
 			if (!testRunner.NameExists("Select Make", 0.1))
 			{
 				if (!testRunner.NameExists("Create Printer", 0.1))
 				{
 					// go to the start page
-					testRunner.ClickByName("Start Tab");
+					testRunner.ClickByName("Hardware Tab");
 				}
 
 				testRunner.ClickByName("Create Printer");