diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java b/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
index 3d4f792e87..fd6edf91b6 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
@@ -65,8 +65,9 @@ public class GeneralIngestConfigurator implements IngestConfigurator {
         String[] enabledModuleNames = ModuleSettings.getConfigSetting(moduleContext, ENABLED_INGEST_MODULES_KEY).split(", ");
         List<IngestModuleAbstract> enabledModules = new ArrayList<>();
         for (String moduleName : enabledModuleNames) {
-            if (moduleName.equals("Thunderbird Parser")) {
-                moduleName = "MBox Parser";
+            if (moduleName.equals("Thunderbird Parser") 
+                    || moduleName.equals("MBox Parser")) {
+                moduleName = "Email Parser";
             }
             IngestModuleAbstract moduleFound =  null;
             for (IngestModuleAbstract module : allModules) {