diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
index 676195c402..a5ed64dc8b 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
@@ -30,7 +30,7 @@ NewCaseVisualPanel2.caseNumberTextField.text=
 NewCaseVisualPanel2.examinerLabel.text=Examiner:
 NewCaseVisualPanel2.caseNumberLabel.text=Case Number:
 NewCaseVisualPanel2.examinerTextField.text=
-NewCaseVisualPanel2.optionalLabel.text=Optional: Set Case Number and Examiner
+NewCaseVisualPanel2.optionalLabel.text=Enter Optional Information: 
 AddImageErrorsDialog.title=Add Image Log
 AddImageErrorsDialog.copyButton.toolTipText=Copy errors to clipboard
 AddImageErrorsDialog.copyButton.text=Copy
@@ -158,13 +158,13 @@ MissingImageDialog.display.title=Search for Missing Image
 MissingImageDialog.confDlg.noFileSel.msg=No image file has been selected, are you sure you\nwould like to exit without finding the image.
 MissingImageDialog.confDlg.noFileSel.title=Missing Image
 MissingImageDialog.ErrorSettingImage=Error setting image path. Please try again.
-NewCaseVisualPanel1.getName.text=Case Info
+NewCaseVisualPanel1.getName.text=Case Information
 NewCaseVisualPanel1.caseDirBrowse.selectButton.text=Select
 NewCaseVisualPanel1.badCredentials.text=Bad multi-user settings (see Tools, Options, Multi-user) or services are down.
-NewCaseVisualPanel2.getName.text=Additional Information
+NewCaseVisualPanel2.getName.text=Optional Information
 NewCaseWizardAction.newCase.windowTitle.text=New Case Information
 NewCaseWizardAction.getName.text=New Case Wizard
-NewCaseWizardAction.databaseProblem1.text=Cannot open database. Cancelling case creation.
+NewCaseWizardAction.databaseProblem1.text=Cannot open database. Canceling case creation.
 NewCaseWizardAction.databaseProblem2.text=Error
 NewCaseWizardPanel1.validate.errMsg.invalidSymbols=The Case Name cannot contain any of the following symbols\: \\ / \: * ? " < > |
 NewCaseWizardPanel1.validate.errMsg.dirExists=Case directory ''{0}'' already exists.
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
index c2c79f7e7a..937d9cc526 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
@@ -73,6 +73,10 @@ class NewCaseVisualPanel2 extends javax.swing.JPanel {
         lbPointOfContactNameText.setEnabled(cREnabled);
         lbPointOfContactEmailText.setEnabled(cREnabled);
         lbPointOfContactPhoneText.setEnabled(cREnabled);
+        lbOrganizationNameLabel.setEnabled(cREnabled);
+        lbPointOfContactNameLabel.setEnabled(cREnabled);
+        lbPointOfContactEmailLabel.setEnabled(cREnabled);
+        lbPointOfContactPhoneLabel.setEnabled(cREnabled);
         if (cREnabled) {
             loadOrganizationData();
         } else {