diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.form b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.form
index f788dcff2d..56cbcf2e03 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.form
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.form
@@ -153,7 +153,6 @@
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbCreateDatabaseDialog.knownRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
-        <Property name="enabled" type="boolean" value="false"/>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="knownRadioButtonActionPerformed"/>
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.java
index 3203a3ccd3..cadbced05d 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.java
@@ -132,7 +132,6 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
 
         buttonGroup1.add(knownRadioButton);
         org.openide.awt.Mnemonics.setLocalizedText(knownRadioButton, org.openide.util.NbBundle.getMessage(HashDbCreateDatabaseDialog.class, "HashDbCreateDatabaseDialog.knownRadioButton.text")); // NOI18N
-        knownRadioButton.setEnabled(false);
         knownRadioButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 knownRadioButtonActionPerformed(evt);
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
index 6c83416fb3..b1a6a96d67 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
@@ -49,7 +49,8 @@ public class HashDbIngestModule extends IngestModuleAbstractFile {
     public final static String MODULE_DESCRIPTION = "Identifies known and notables files using supplied hash databases, such as a standard NSRL database.";
     final public static String MODULE_VERSION = Version.getVersion();
     private static final Logger logger = Logger.getLogger(HashDbIngestModule.class.getName());
-    private HashDbConfigPanel panel;
+    private HashDbSimpleConfigPanel simpleConfigPanel;
+    private HashDbConfigPanel advancedConfigPanel;
     private IngestServices services;
     private SleuthkitCase skCase;
     private static int messageId = 0;
@@ -93,7 +94,11 @@ public class HashDbIngestModule extends IngestModuleAbstractFile {
     
     @Override
     public javax.swing.JPanel getSimpleConfiguration(String context) {
-        return new HashDbSimpleConfigPanel();
+        if (simpleConfigPanel == null) {
+           simpleConfigPanel = new HashDbSimpleConfigPanel();  
+        }
+        
+        return simpleConfigPanel;
     }
 
     @Override
@@ -108,18 +113,22 @@ public class HashDbIngestModule extends IngestModuleAbstractFile {
     
     @Override
     public javax.swing.JPanel getAdvancedConfiguration(String context) {
-        if (panel == null) {
-            panel = new HashDbConfigPanel();
+        if (advancedConfigPanel == null) {
+            advancedConfigPanel = new HashDbConfigPanel();
         }
         
-        panel.load();
-        return panel;
+        advancedConfigPanel.load();
+        return advancedConfigPanel;
     }
 
     @Override
     public void saveAdvancedConfiguration() {
-        if (panel != null) {
-            panel.store();
+        if (advancedConfigPanel != null) {
+            advancedConfigPanel.store();
+        }
+        
+        if (simpleConfigPanel != null) {
+            simpleConfigPanel.refreshComponents();
         }
     }
     
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimpleConfigPanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimpleConfigPanel.java
index f9545bac6d..bd8388fc62 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimpleConfigPanel.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimpleConfigPanel.java
@@ -79,9 +79,10 @@ public class HashDbSimpleConfigPanel extends javax.swing.JPanel {
         }        
     }
     
-    private void refreshComponents() {        
-        refreshAlwaysCalcHashesComponents();        
+    public void refreshComponents() {        
+        knownTableModel.refresh();
         knownBadTableModel.refresh();
+        refreshAlwaysCalcHashesComponents(); 
     }
 
     private void refreshAlwaysCalcHashesComponents() {        
@@ -164,7 +165,6 @@ public class HashDbSimpleConfigPanel extends javax.swing.JPanel {
                 else {
                     JOptionPane.showMessageDialog(HashDbSimpleConfigPanel.this, "Hash databases must be indexed before they can be used for ingest");
                 }
-                refreshComponents();
             }
         }