diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java
index 8b9b169d6769176983a6d9b73121c8bc091210b3..375943188cba85bcf23613c24c47848a37e30da7 100644
--- a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java
+++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java
@@ -137,8 +137,8 @@ public synchronized void loadSettings() {
             this.purchaseFromLabel.setVisible(false);
             this.purchaseLink.setVisible(false);
         } else {
-            this.purchaseFromLabel.setVisible(false);
-            this.purchaseLink.setVisible(false);           
+            this.purchaseFromLabel.setVisible(true);
+            this.purchaseLink.setVisible(true);           
         }
     }
 
@@ -485,7 +485,12 @@ private synchronized void renderLicenseState() {
             this.licenseInfoExpiresLabel.setVisible(false);
             this.licenseInfoIdLabel.setVisible(false);
             this.licenseInfoUserLabel.setVisible(false);
+            this.purchaseFromLabel.setVisible(true);
+            this.purchaseLink.setVisible(true);           
         } else {
+            this.purchaseFromLabel.setVisible(false);
+            this.purchaseLink.setVisible(false);           
+
             this.licenseInfoExpiresLabel.setVisible(true);
             this.licenseInfoExpiresLabel.setText(Bundle.CTMalwareScannerOptionsPanel_licenseInfo_expires(
                     this.licenseInfo.getDecryptedLicense().getExpirationDate() == null
diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/incidentoptions/CTSettings.java b/Core/src/com/basistech/df/cybertriage/autopsy/incidentoptions/CTSettings.java
index 4e9d4b4697bb548d44fae7b88603e18fa7f870d2..35e2d108eae0b1c5e7850e847a47cc8970c33baf 100644
--- a/Core/src/com/basistech/df/cybertriage/autopsy/incidentoptions/CTSettings.java
+++ b/Core/src/com/basistech/df/cybertriage/autopsy/incidentoptions/CTSettings.java
@@ -23,7 +23,8 @@
 import org.openide.modules.Places;
 
 /**
- * CT settings that don't include license information.
+ * CT settings that don't include license information. This code must be kept in-sync with code in
+ * CT Autopsy Importer NBM.
  */
 public class CTSettings {
 
diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/incidentoptions/CTSettingsPersistence.java b/Core/src/com/basistech/df/cybertriage/autopsy/incidentoptions/CTSettingsPersistence.java
index d9addd196049462cc1dfb0532244828d9b94c098..be60813edd89a61d497290316ee69e2f3472b27c 100644
--- a/Core/src/com/basistech/df/cybertriage/autopsy/incidentoptions/CTSettingsPersistence.java
+++ b/Core/src/com/basistech/df/cybertriage/autopsy/incidentoptions/CTSettingsPersistence.java
@@ -22,7 +22,8 @@
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 
 /**
- * Handles persisting CT Settings.
+ * Handles persisting CT Settings. This code must be kept in-sync with code in
+ * CT Autopsy Importer NBM.
  */
 public class CTSettingsPersistence {