diff --git a/PrinterControls/PrinterConnections/PrinterChooser.cs b/PrinterControls/PrinterConnections/PrinterChooser.cs
index 8f9469d5c..c5df4b292 100644
--- a/PrinterControls/PrinterConnections/PrinterChooser.cs
+++ b/PrinterControls/PrinterConnections/PrinterChooser.cs
@@ -62,15 +62,16 @@ namespace MatterHackers.MatterControl
 				{
 					string folderName = Path.GetFileName(manufacturerDirectory.TrimEnd(new[] { '/', '\\' }));
 
-					foreach(ManufacturerNameMapping nameMapping in manufacturerNameMappings)
+					// Set manufacturer name to the directory name
+					this.manufacturer = Path.GetFileName(manufacturerDirectory);
+
+					// Override the manufacturer name if a manufacturerNameMappings exists
+					foreach (ManufacturerNameMapping nameMapping in manufacturerNameMappings)
 					{
 						if(nameMapping.NameOnDisk == folderName)
 						{
 							this.manufacturer = nameMapping.NameToDisplay;
-						}
-						else
-						{
-							this.manufacturer = Path.GetFileName(manufacturerDirectory);
+							break;
 						}
 					}
 
diff --git a/SettingsManagement/OemSettings.cs b/SettingsManagement/OemSettings.cs
index a1493c655..ef3788aac 100644
--- a/SettingsManagement/OemSettings.cs
+++ b/SettingsManagement/OemSettings.cs
@@ -95,6 +95,7 @@ namespace MatterHackers.MatterControl.SettingsManagement
             string pathToOemSettings = Path.Combine(".", "OEMSettings", "Settings.json");
             File.WriteAllText(pathToOemSettings, JsonConvert.SerializeObject(this, Formatting.Indented));
 #endif
+			this.ManufacturerNameMappings = new List<ManufacturerNameMapping>();
 		}
 	}