diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
index bcfd028e7e..409c33c76c 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
@@ -93,7 +93,7 @@ DataContentViewerHex.goToOffsetTextField.msgDlg=Invalid Offset: {0}
 DataContentViewerHex.setDataView.invalidOffset.negativeOffsetValue=Cannot jump to the resultant offset
 MultiUserSettingsPanel.tbOops.text=
 MultiUserSettingsPanel.lbTestDatabase.text=
-MultiUserSettingsPanel.bnTestDatabase.text=Test
+MultiUserSettingsPanel.bnTestDatabase.text=Test Connection
 MultiUserSettingsPanel.tbDbHostname.toolTipText=Hostname or IP Address
 MultiUserSettingsPanel.tbDbHostname.text=
 MultiUserSettingsPanel.tbDbPort.toolTipText=Port Number
@@ -102,10 +102,8 @@ MultiUserSettingsPanel.tbDbUsername.toolTipText=User Name
 MultiUserSettingsPanel.tbDbUsername.text=
 MultiUserSettingsPanel.tbDbPassword.toolTipText=Password
 MultiUserSettingsPanel.tbDbPassword.text=
-MultiUserSettingsPanel.lbTestSolr.text=
-MultiUserSettingsPanel.bnTestSolr.text=Test
 MultiUserSettingsPanel.lbTestMessageService.text=
-MultiUserSettingsPanel.bnTestMessageService.text=Test
+MultiUserSettingsPanel.bnTestMessageService.text=Test Connection
 MultiUserSettingsPanel.lbMessageServiceSettings.text=ActiveMQ Message Server Settings
 MultiUserSettingsPanel.tbMsgPort.toolTipText=Port Number
 MultiUserSettingsPanel.tbMsgPort.text=
@@ -116,9 +114,10 @@ MultiUserSettingsPanel.tbMsgPassword.text=
 MultiUserSettingsPanel.tbMsgHostname.toolTipText=Hostname or IP Address
 MultiUserSettingsPanel.tbMsgHostname.text=
 MultiUserSettingsPanel.lbTestMessageWarning.text=
-MultiUserSettingsPanel.lbTestSolrWarning.text=
 MultiUserSettingsPanel.lbTestDbWarning.text=
 MultiUserSettingsPanel.KeywordSearchNull=Cannot find keyword search service
+MultiUserSettingsPanel.Solr4ConnectionInfoMissing.error=Missing or incomplete Solr 4 connection info
+MultiUserSettingsPanel.Solr8ConnectionInfoMissing.error=Missing or incomplete Solr 8 connection info
 MultiUserSettingsPanel.UnableToConnectToZK=Unable to connect to ZooKeeper service
 MultiUserSettingsPanel.InvalidPortNumber=Invalid port number
 AutopsyOptionsPanel.agencyLogoImageLabel.toolTipText=
@@ -182,14 +181,14 @@ MultiUserSettingsPanel.tbSolr4Port.toolTipText=Solr 4 Port Number
 MultiUserSettingsPanel.lbZkSettings.text=ZooKeeper Server Settings
 MultiUserSettingsPanel.lbSolr4Settings.text=Solr 4 Server Settings
 MultiUserSettingsPanel.lbSolr8Settings.text=Solr 8 Server Settings
-MultiUserSettingsPanel.tbZkHostname.toolTipText=ZooKeeper Hostname or IP Address
-MultiUserSettingsPanel.tbZkPort.toolTipText=ZooKeeper Port Number
+MultiUserSettingsPanel.tbZkHostname.toolTipText=ZooKeeper Hostname or IP Address. Embedded ZooKeeper usually run on the same host as Solr server.
+MultiUserSettingsPanel.tbZkPort.toolTipText=ZooKeeper port number. Embedded ZooKeeper uses port number that is 1,000 greater than the Solr service port number. For example, if Solr service port number is 8983 then embedded ZooKeeper port number is 9983.
 MultiUserSettingsPanel.tbSolr8Hostname.toolTipText=Solr 8 Hostname or IP Address
 MultiUserSettingsPanel.tbSolr8Port.toolTipText=Solr 8 Port Number
 MultiUserSettingsPanel.restartRequiredLabel.text=Application restart required to take effect.
 MultiUserSettingsPanel.MustRestart=Autopsy must be restarted for new configuration to take effect
-MultiUserSettingsPanel.lbSolrNote1.text=NOTE: Enter Solr 8 and/or Solr 4 server settings.
-MultiUserSettingsPanel.lbSolrNote2.text=New cases can only be created with Solr 8.
+MultiUserSettingsPanel.lbSolrNote1.text=Enter Solr 8 and/or Solr 4 server settings.
+MultiUserSettingsPanel.lbSolrNote2.text=New text indexing can only be done with Solr 8.
 AutopsyOptionsPanel.tempDirectoryField.text=
 AutopsyOptionsPanel.tempDirectoryBrowseButton.text=Browse
 AutopsyOptionsPanel.a.AccessibleContext.accessibleName=Temp Directory
@@ -231,6 +230,13 @@ ViewPreferencesPanel.useBestViewerRadioButton.toolTipText=For example, change fr
 ViewPreferencesPanel.useBestViewerRadioButton.text=Change to the most specific file viewer
 ViewPreferencesPanel.selectFileLabel.text=When selecting a file:
 ViewPreferencesPanel.globalSettingsPanel.border.title=Global Settings
+MultiUserSettingsPanel.bnTestSolr8.text=Test Connection
+MultiUserSettingsPanel.lbTestSolr8.text=
+MultiUserSettingsPanel.bnTestSolr4.text=Test Connection
+MultiUserSettingsPanel.lbTestSolr4.text=
+MultiUserSettingsPanel.bnTestZK.text=Test Connection
+MultiUserSettingsPanel.lbTestZK.text=
+MultiUserSettingsPanel.lbWarning.text=
 AutopsyOptionsPanel.rdpPanel.border.title=Windows High DPI Scaling
 AutopsyOptionsPanel.sizingTextPane.text=Make the following changes if the application is hard to navigate in High DPI systems:\n\n1. Right click on the application icon on your Desktop, Start Menu, etc.\n2. Choose Properties\n3. Go to Compatibility tab\n4. Click "Change high DPI settings" button\n5. Select "Override high DPI scaling behavior" \n6. Change the "Scaling performed by:" drop down box to "System"\n7. Restart Autopsy
 AutopsyOptionsPanel.agencyLogoPathFieldValidationLabel.text=
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED
index 60e55fe697..70d6e46af9 100755
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED
@@ -148,7 +148,7 @@ DataContentViewerHex.goToOffsetTextField.msgDlg=Invalid Offset: {0}
 DataContentViewerHex.setDataView.invalidOffset.negativeOffsetValue=Cannot jump to the resultant offset
 MultiUserSettingsPanel.tbOops.text=
 MultiUserSettingsPanel.lbTestDatabase.text=
-MultiUserSettingsPanel.bnTestDatabase.text=Test
+MultiUserSettingsPanel.bnTestDatabase.text=Test Connection
 MultiUserSettingsPanel.tbDbHostname.toolTipText=Hostname or IP Address
 MultiUserSettingsPanel.tbDbHostname.text=
 MultiUserSettingsPanel.tbDbPort.toolTipText=Port Number
@@ -157,10 +157,8 @@ MultiUserSettingsPanel.tbDbUsername.toolTipText=User Name
 MultiUserSettingsPanel.tbDbUsername.text=
 MultiUserSettingsPanel.tbDbPassword.toolTipText=Password
 MultiUserSettingsPanel.tbDbPassword.text=
-MultiUserSettingsPanel.lbTestSolr.text=
-MultiUserSettingsPanel.bnTestSolr.text=Test
 MultiUserSettingsPanel.lbTestMessageService.text=
-MultiUserSettingsPanel.bnTestMessageService.text=Test
+MultiUserSettingsPanel.bnTestMessageService.text=Test Connection
 MultiUserSettingsPanel.lbMessageServiceSettings.text=ActiveMQ Message Server Settings
 MultiUserSettingsPanel.tbMsgPort.toolTipText=Port Number
 MultiUserSettingsPanel.tbMsgPort.text=
@@ -171,9 +169,10 @@ MultiUserSettingsPanel.tbMsgPassword.text=
 MultiUserSettingsPanel.tbMsgHostname.toolTipText=Hostname or IP Address
 MultiUserSettingsPanel.tbMsgHostname.text=
 MultiUserSettingsPanel.lbTestMessageWarning.text=
-MultiUserSettingsPanel.lbTestSolrWarning.text=
 MultiUserSettingsPanel.lbTestDbWarning.text=
 MultiUserSettingsPanel.KeywordSearchNull=Cannot find keyword search service
+MultiUserSettingsPanel.Solr4ConnectionInfoMissing.error=Missing or incomplete Solr 4 connection info
+MultiUserSettingsPanel.Solr8ConnectionInfoMissing.error=Missing or incomplete Solr 8 connection info
 MultiUserSettingsPanel.UnableToConnectToZK=Unable to connect to ZooKeeper service
 MultiUserSettingsPanel.InvalidPortNumber=Invalid port number
 AutopsyOptionsPanel.agencyLogoImageLabel.toolTipText=
@@ -239,14 +238,14 @@ MultiUserSettingsPanel.tbSolr4Port.toolTipText=Solr 4 Port Number
 MultiUserSettingsPanel.lbZkSettings.text=ZooKeeper Server Settings
 MultiUserSettingsPanel.lbSolr4Settings.text=Solr 4 Server Settings
 MultiUserSettingsPanel.lbSolr8Settings.text=Solr 8 Server Settings
-MultiUserSettingsPanel.tbZkHostname.toolTipText=ZooKeeper Hostname or IP Address
-MultiUserSettingsPanel.tbZkPort.toolTipText=ZooKeeper Port Number
+MultiUserSettingsPanel.tbZkHostname.toolTipText=ZooKeeper Hostname or IP Address. Embedded ZooKeeper usually run on the same host as Solr server.
+MultiUserSettingsPanel.tbZkPort.toolTipText=ZooKeeper port number. Embedded ZooKeeper uses port number that is 1,000 greater than the Solr service port number. For example, if Solr service port number is 8983 then embedded ZooKeeper port number is 9983.
 MultiUserSettingsPanel.tbSolr8Hostname.toolTipText=Solr 8 Hostname or IP Address
 MultiUserSettingsPanel.tbSolr8Port.toolTipText=Solr 8 Port Number
 MultiUserSettingsPanel.restartRequiredLabel.text=Application restart required to take effect.
 MultiUserSettingsPanel.MustRestart=Autopsy must be restarted for new configuration to take effect
-MultiUserSettingsPanel.lbSolrNote1.text=NOTE: Enter Solr 8 and/or Solr 4 server settings.
-MultiUserSettingsPanel.lbSolrNote2.text=New cases can only be created with Solr 8.
+MultiUserSettingsPanel.lbSolrNote1.text=Enter Solr 8 and/or Solr 4 server settings.
+MultiUserSettingsPanel.lbSolrNote2.text=New text indexing can only be done with Solr 8.
 AutopsyOptionsPanel.tempDirectoryField.text=
 AutopsyOptionsPanel.tempDirectoryBrowseButton.text=Browse
 AutopsyOptionsPanel.a.AccessibleContext.accessibleName=Temp Directory
@@ -288,6 +287,13 @@ ViewPreferencesPanel.useBestViewerRadioButton.toolTipText=For example, change fr
 ViewPreferencesPanel.useBestViewerRadioButton.text=Change to the most specific file viewer
 ViewPreferencesPanel.selectFileLabel.text=When selecting a file:
 ViewPreferencesPanel.globalSettingsPanel.border.title=Global Settings
+MultiUserSettingsPanel.bnTestSolr8.text=Test Connection
+MultiUserSettingsPanel.lbTestSolr8.text=
+MultiUserSettingsPanel.bnTestSolr4.text=Test Connection
+MultiUserSettingsPanel.lbTestSolr4.text=
+MultiUserSettingsPanel.bnTestZK.text=Test Connection
+MultiUserSettingsPanel.lbTestZK.text=
+MultiUserSettingsPanel.lbWarning.text=
 AutopsyOptionsPanel.rdpPanel.border.title=Windows High DPI Scaling
 AutopsyOptionsPanel.sizingTextPane.text=Make the following changes if the application is hard to navigate in High DPI systems:\n\n1. Right click on the application icon on your Desktop, Start Menu, etc.\n2. Choose Properties\n3. Go to Compatibility tab\n4. Click "Change high DPI settings" button\n5. Select "Override high DPI scaling behavior" \n6. Change the "Scaling performed by:" drop down box to "System"\n7. Restart Autopsy
 AutopsyOptionsPanel.agencyLogoPathFieldValidationLabel.text=
@@ -297,3 +303,4 @@ AutopsyOptionsPanel.agencyLogoPreview.text=<html><div style='text-align: center;
 AutopsyOptionsPanel.browseLogosButton.text=Browse
 AutopsyOptionsPanel.agencyLogoPathField.text=
 AutopsyOptionsPanel.logoPanel.border.title=Logo
+
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
index e60b283b92..e8c7bdcf13 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
@@ -232,7 +232,6 @@ MultiUserSettingsPanel.lbTestDbWarning.text=
 MultiUserSettingsPanel.lbTestMessageService.text=
 MultiUserSettingsPanel.lbTestMessageWarning.text=
 MultiUserSettingsPanel.lbTestSolr.text=
-MultiUserSettingsPanel.lbTestSolrWarning.text=
 MultiUserSettingsPanel.nonWindowsOs.msg=\u30de\u30eb\u30c1\u30e6\u30fc\u30b6\u30fc\u30b1\u30fc\u30b9\u306fWindows\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u4e0a\u3067\u306e\u307f\u5229\u7528\u3067\u304d\u307e\u3059
 MultiUserSettingsPanel.tbDbHostname.text=
 MultiUserSettingsPanel.tbDbHostname.toolTipText=\u30db\u30b9\u30c8\u540d\u307e\u305f\u306fIP\u30a2\u30c9\u30ec\u30b9
@@ -243,8 +242,6 @@ MultiUserSettingsPanel.tbDbPort.toolTipText=\u30dd\u30fc\u30c8\u756a\u53f7
 MultiUserSettingsPanel.tbDbUsername.text=
 MultiUserSettingsPanel.tbDbPassword.toolTipText=\u30d1\u30b9\u30ef\u30fc\u30c9
 MultiUserSettingsPanel.tbDbPassword.text=
-MultiUserSettingsPanel.lbTestSolr.text=
-MultiUserSettingsPanel.bnTestSolr.text=\u30c6\u30b9\u30c8
 MultiUserSettingsPanel.lbTestMessageService.text=
 MultiUserSettingsPanel.bnTestMessageService.text=\u30c6\u30b9\u30c8
 MultiUserSettingsPanel.lbMessageServiceSettings.text=ActiveMQ\u30e1\u30c3\u30bb\u30fc\u30b8\u30b5\u30fc\u30d3\u30b9\u8a2d\u5b9a
@@ -325,6 +322,13 @@ ViewPreferencesPanel.useBestViewerRadioButton.toolTipText=\u305f\u3068\u3048\u30
 ViewPreferencesPanel.useBestViewerRadioButton.text=\u6700\u3082\u56fa\u6709\u306e\u30d5\u30a1\u30a4\u30eb\u30d3\u30e5\u30fc\u306b\u5207\u308a\u66ff\u3048\u308b
 ViewPreferencesPanel.selectFileLabel.text=\u30d5\u30a1\u30a4\u30eb\u9078\u629e\u6642:
 ViewPreferencesPanel.globalSettingsPanel.border.title=\u30b0\u30ed\u30fc\u30d0\u30eb\u8a2d\u5b9a
+MultiUserSettingsPanel.bnTestSolr8.text=\u30c6\u30b9\u30c8
+MultiUserSettingsPanel.lbTestSolr8.text=
+MultiUserSettingsPanel.bnTestSolr4.text=\u30c6\u30b9\u30c8
+MultiUserSettingsPanel.lbTestSolr4.text=
+MultiUserSettingsPanel.bnTestZK.text=\u30c6\u30b9\u30c8
+MultiUserSettingsPanel.lbTestZK.text=
+MultiUserSettingsPanel.lbWarning.text=
 AutopsyOptionsPanel.agencyLogoPathFieldValidationLabel.text=
 AutopsyOptionsPanel.specifyLogoRB.text=\u30ed\u30b4\u3092\u6307\u5b9a
 AutopsyOptionsPanel.defaultLogoRB.text=\u30c7\u30d5\u30a9\u30eb\u30c8\u3092\u4f7f\u7528
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form
index 97273e1dbb..da3b222484 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form
@@ -16,7 +16,7 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jScrollPane" alignment="0" pref="1191" max="32767" attributes="0"/>
+          <Component id="jScrollPane" alignment="0" pref="1250" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
@@ -72,7 +72,7 @@
                           </Group>
                           <Component id="pnSolrSettings" max="32767" attributes="0"/>
                       </Group>
-                      <EmptySpace pref="201" max="32767" attributes="0"/>
+                      <EmptySpace pref="234" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
@@ -256,29 +256,38 @@
                       <Group type="102" attributes="0">
                           <EmptySpace max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="0" attributes="0">
-                              <Component id="tbSolr8Hostname" max="32767" attributes="0"/>
-                              <Group type="102" attributes="0">
-                                  <Group type="103" groupAlignment="0" attributes="0">
-                                      <Component id="lbSolr8Settings" min="-2" max="-2" attributes="0"/>
-                                      <Component id="lbSolrNote1" alignment="0" min="-2" max="-2" attributes="0"/>
-                                      <Component id="lbSolrNote2" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  </Group>
-                                  <EmptySpace pref="57" max="32767" attributes="0"/>
-                                  <Component id="bnTestSolr" min="-2" max="-2" attributes="0"/>
-                                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                  <Component id="lbTestSolr" min="-2" pref="16" max="-2" attributes="0"/>
-                                  <EmptySpace min="-2" pref="3" max="-2" attributes="0"/>
+                              <Group type="102" alignment="0" attributes="0">
+                                  <Component id="lbSolr4Settings" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace max="32767" attributes="0"/>
+                                  <Component id="bnTestSolr4" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace type="separate" max="-2" attributes="0"/>
+                                  <Component id="lbTestSolr4" min="-2" pref="16" max="-2" attributes="0"/>
                               </Group>
+                              <Component id="tbSolr8Hostname" max="32767" attributes="0"/>
                               <Component id="tbSolr8Port" alignment="0" max="32767" attributes="0"/>
                               <Component id="tbSolr4Hostname" alignment="0" max="32767" attributes="0"/>
                               <Component id="tbSolr4Port" alignment="0" max="32767" attributes="0"/>
                               <Component id="tbZkHostname" alignment="0" max="32767" attributes="0"/>
                               <Component id="tbZkPort" alignment="0" max="32767" attributes="0"/>
+                              <Group type="102" alignment="0" attributes="0">
+                                  <Component id="lbZkSettings" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace pref="164" max="32767" attributes="0"/>
+                                  <Component id="bnTestZK" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace type="separate" max="-2" attributes="0"/>
+                                  <Component id="lbTestZK" min="-2" pref="16" max="-2" attributes="0"/>
+                              </Group>
+                              <Group type="102" alignment="0" attributes="0">
+                                  <Component id="lbSolr8Settings" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace max="32767" attributes="0"/>
+                                  <Component id="bnTestSolr8" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace type="separate" max="-2" attributes="0"/>
+                                  <Component id="lbTestSolr8" min="-2" pref="16" max="-2" attributes="0"/>
+                              </Group>
                               <Group type="102" attributes="0">
                                   <Group type="103" groupAlignment="0" attributes="0">
-                                      <Component id="lbTestSolrWarning" alignment="0" min="-2" max="-2" attributes="0"/>
-                                      <Component id="lbSolr4Settings" alignment="0" min="-2" max="-2" attributes="0"/>
-                                      <Component id="lbZkSettings" alignment="0" min="-2" max="-2" attributes="0"/>
+                                      <Component id="lbSolrNote1" alignment="0" min="-2" max="-2" attributes="0"/>
+                                      <Component id="lbSolrNote2" alignment="0" min="-2" max="-2" attributes="0"/>
+                                      <Component id="lbWarning" min="-2" max="-2" attributes="0"/>
                                   </Group>
                                   <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                               </Group>
@@ -293,33 +302,53 @@
                           <EmptySpace min="-2" pref="8" max="-2" attributes="0"/>
                           <Component id="lbSolrNote1" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="lbSolrNote2" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
-                          <Group type="103" groupAlignment="0" attributes="0">
-                              <Group type="103" groupAlignment="1" attributes="0">
+                          <Group type="103" groupAlignment="1" attributes="0">
+                              <Group type="102" attributes="0">
+                                  <Component id="lbSolrNote2" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
                                   <Component id="lbSolr8Settings" min="-2" max="-2" attributes="0"/>
-                                  <Component id="bnTestSolr" min="-2" max="-2" attributes="0"/>
                               </Group>
-                              <Component id="lbTestSolr" min="-2" pref="23" max="-2" attributes="0"/>
+                              <Group type="102" alignment="1" attributes="0">
+                                  <Component id="lbTestSolr8" min="-2" pref="23" max="-2" attributes="0"/>
+                                  <EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
+                              </Group>
+                              <Component id="bnTestSolr8" alignment="1" min="-2" max="-2" attributes="0"/>
                           </Group>
-                          <EmptySpace max="-2" attributes="0"/>
+                          <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
                           <Component id="tbSolr8Hostname" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
                           <Component id="tbSolr8Port" min="-2" max="-2" attributes="0"/>
                           <EmptySpace type="separate" max="-2" attributes="0"/>
-                          <Component id="lbSolr4Settings" min="-2" pref="21" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="tbSolr4Hostname" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="tbSolr4Port" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                          <Component id="lbZkSettings" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="tbZkHostname" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="tbZkPort" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="32767" attributes="0"/>
-                          <Component id="lbTestSolrWarning" min="-2" pref="16" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Group type="102" attributes="0">
+                                  <Group type="103" groupAlignment="3" attributes="0">
+                                      <Component id="lbSolr4Settings" alignment="3" min="-2" pref="21" max="-2" attributes="0"/>
+                                      <Component id="bnTestSolr4" alignment="3" min="-2" max="-2" attributes="0"/>
+                                  </Group>
+                                  <EmptySpace max="-2" attributes="0"/>
+                                  <Component id="tbSolr4Hostname" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace max="-2" attributes="0"/>
+                                  <Component id="tbSolr4Port" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                                  <Group type="103" groupAlignment="0" attributes="0">
+                                      <Group type="103" groupAlignment="3" attributes="0">
+                                          <Component id="lbZkSettings" alignment="3" min="-2" max="-2" attributes="0"/>
+                                          <Component id="bnTestZK" alignment="3" min="-2" max="-2" attributes="0"/>
+                                      </Group>
+                                      <Component id="lbTestZK" alignment="1" min="-2" pref="23" max="-2" attributes="0"/>
+                                  </Group>
+                                  <EmptySpace max="-2" attributes="0"/>
+                                  <Component id="tbZkHostname" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace max="-2" attributes="0"/>
+                                  <Component id="tbZkPort" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace max="32767" attributes="0"/>
+                                  <Component id="lbWarning" min="-2" pref="16" max="-2" attributes="0"/>
+                              </Group>
+                              <Group type="102" attributes="0">
+                                  <Component id="lbTestSolr4" min="-2" pref="23" max="-2" attributes="0"/>
+                                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                              </Group>
+                          </Group>
                           <EmptySpace max="-2" attributes="0"/>
                       </Group>
                   </Group>
@@ -362,30 +391,30 @@
                     </Property>
                   </Properties>
                 </Component>
-                <Component class="javax.swing.JButton" name="bnTestSolr">
+                <Component class="javax.swing.JButton" name="bnTestSolr8">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.bnTestSolr.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.bnTestSolr8.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                   <Events>
-                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bnTestSolrActionPerformed"/>
+                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bnTestSolr8ActionPerformed"/>
                   </Events>
                 </Component>
-                <Component class="javax.swing.JLabel" name="lbTestSolr">
+                <Component class="javax.swing.JLabel" name="lbTestSolr8">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.lbTestSolr.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.lbTestSolr8.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                 </Component>
-                <Component class="javax.swing.JLabel" name="lbTestSolrWarning">
+                <Component class="javax.swing.JLabel" name="lbWarning">
                   <Properties>
                     <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
                       <Color blue="0" green="0" red="ff" type="rgb"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.lbTestSolrWarning.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.lbWarning.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                 </Component>
@@ -473,6 +502,9 @@
                         <Font component="lbSolrNote1" property="font" relativeSize="true" size="1"/>
                       </FontInfo>
                     </Property>
+                    <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                      <Image iconType="3" name="/org/sleuthkit/autopsy/corecomponents/warning16.png"/>
+                    </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.lbSolrNote1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
@@ -490,6 +522,40 @@
                     </Property>
                   </Properties>
                 </Component>
+                <Component class="javax.swing.JButton" name="bnTestSolr4">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.bnTestSolr4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                    </Property>
+                  </Properties>
+                  <Events>
+                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bnTestSolr4ActionPerformed"/>
+                  </Events>
+                </Component>
+                <Component class="javax.swing.JLabel" name="lbTestSolr4">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.lbTestSolr4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                    </Property>
+                  </Properties>
+                </Component>
+                <Component class="javax.swing.JLabel" name="lbTestZK">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.lbTestZK.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                    </Property>
+                  </Properties>
+                </Component>
+                <Component class="javax.swing.JButton" name="bnTestZK">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.bnTestZK.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                    </Property>
+                  </Properties>
+                  <Events>
+                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bnTestZKActionPerformed"/>
+                  </Events>
+                </Component>
               </SubComponents>
             </Container>
             <Container class="javax.swing.JPanel" name="pnMessagingSettings">
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
index bec42f0dc1..65c447c7af 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
@@ -123,12 +123,12 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
         tbDbUsername.getDocument().putProperty("statusIcon", lbTestDatabase);
         tbDbPassword.getDocument().putProperty("statusIcon", lbTestDatabase);
 
-        tbSolr8Hostname.getDocument().putProperty("statusIcon", lbTestSolr);
-        tbSolr8Port.getDocument().putProperty("statusIcon", lbTestSolr);
-        tbSolr4Hostname.getDocument().putProperty("statusIcon", lbTestSolr);
-        tbSolr4Port.getDocument().putProperty("statusIcon", lbTestSolr);
-        tbZkHostname.getDocument().putProperty("statusIcon", lbTestSolr);
-        tbZkPort.getDocument().putProperty("statusIcon", lbTestSolr);
+        tbSolr8Hostname.getDocument().putProperty("statusIcon", lbTestSolr8);
+        tbSolr8Port.getDocument().putProperty("statusIcon", lbTestSolr8);
+        tbSolr4Hostname.getDocument().putProperty("statusIcon", lbTestSolr4);
+        tbSolr4Port.getDocument().putProperty("statusIcon", lbTestSolr4);
+        tbZkHostname.getDocument().putProperty("statusIcon", lbTestZK);
+        tbZkPort.getDocument().putProperty("statusIcon", lbTestZK);
 
         tbMsgHostname.getDocument().putProperty("statusIcon", lbTestMessageService);
         tbMsgPort.getDocument().putProperty("statusIcon", lbTestMessageService);
@@ -211,9 +211,9 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
         lbSolr8Settings = new javax.swing.JLabel();
         tbSolr8Hostname = new javax.swing.JTextField();
         tbSolr8Port = new javax.swing.JTextField();
-        bnTestSolr = new javax.swing.JButton();
-        lbTestSolr = new javax.swing.JLabel();
-        lbTestSolrWarning = new javax.swing.JLabel();
+        bnTestSolr8 = new javax.swing.JButton();
+        lbTestSolr8 = new javax.swing.JLabel();
+        lbWarning = new javax.swing.JLabel();
         tbSolr4Hostname = new javax.swing.JTextField();
         tbSolr4Port = new javax.swing.JTextField();
         lbSolr4Settings = new javax.swing.JLabel();
@@ -222,6 +222,10 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
         tbZkPort = new javax.swing.JTextField();
         lbSolrNote1 = new javax.swing.JLabel();
         lbSolrNote2 = new javax.swing.JLabel();
+        bnTestSolr4 = new javax.swing.JButton();
+        lbTestSolr4 = new javax.swing.JLabel();
+        lbTestZK = new javax.swing.JLabel();
+        bnTestZK = new javax.swing.JButton();
         pnMessagingSettings = new javax.swing.JPanel();
         lbMessageServiceSettings = new javax.swing.JLabel();
         tbMsgHostname = new javax.swing.JTextField();
@@ -323,17 +327,17 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
         tbSolr8Port.setFont(tbSolr8Port.getFont().deriveFont(tbSolr8Port.getFont().getSize()+1f));
         tbSolr8Port.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbSolr8Port.toolTipText")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(bnTestSolr, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.bnTestSolr.text")); // NOI18N
-        bnTestSolr.addActionListener(new java.awt.event.ActionListener() {
+        org.openide.awt.Mnemonics.setLocalizedText(bnTestSolr8, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.bnTestSolr8.text")); // NOI18N
+        bnTestSolr8.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-                bnTestSolrActionPerformed(evt);
+                bnTestSolr8ActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(lbTestSolr, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbTestSolr.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(lbTestSolr8, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbTestSolr8.text")); // NOI18N
 
-        lbTestSolrWarning.setForeground(new java.awt.Color(255, 0, 0));
-        org.openide.awt.Mnemonics.setLocalizedText(lbTestSolrWarning, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbTestSolrWarning.text")); // NOI18N
+        lbWarning.setForeground(new java.awt.Color(255, 0, 0));
+        org.openide.awt.Mnemonics.setLocalizedText(lbWarning, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbWarning.text")); // NOI18N
 
         tbSolr4Hostname.setFont(tbSolr4Hostname.getFont().deriveFont(tbSolr4Hostname.getFont().getSize()+1f));
         tbSolr4Hostname.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbSolr4Hostname.toolTipText")); // NOI18N
@@ -354,11 +358,30 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
         tbZkPort.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbZkPort.toolTipText")); // NOI18N
 
         lbSolrNote1.setFont(lbSolrNote1.getFont().deriveFont(lbSolrNote1.getFont().getSize()+1f));
+        lbSolrNote1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/corecomponents/warning16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(lbSolrNote1, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbSolrNote1.text")); // NOI18N
 
         lbSolrNote2.setFont(lbSolrNote2.getFont().deriveFont(lbSolrNote2.getFont().getSize()+1f));
         org.openide.awt.Mnemonics.setLocalizedText(lbSolrNote2, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbSolrNote2.text")); // NOI18N
 
+        org.openide.awt.Mnemonics.setLocalizedText(bnTestSolr4, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.bnTestSolr4.text")); // NOI18N
+        bnTestSolr4.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                bnTestSolr4ActionPerformed(evt);
+            }
+        });
+
+        org.openide.awt.Mnemonics.setLocalizedText(lbTestSolr4, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbTestSolr4.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(lbTestZK, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbTestZK.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(bnTestZK, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.bnTestZK.text")); // NOI18N
+        bnTestZK.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                bnTestZKActionPerformed(evt);
+            }
+        });
+
         javax.swing.GroupLayout pnSolrSettingsLayout = new javax.swing.GroupLayout(pnSolrSettings);
         pnSolrSettings.setLayout(pnSolrSettingsLayout);
         pnSolrSettingsLayout.setHorizontalGroup(
@@ -366,27 +389,35 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
             .addGroup(pnSolrSettingsLayout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(tbSolr8Hostname)
                     .addGroup(pnSolrSettingsLayout.createSequentialGroup()
-                        .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(lbSolr8Settings)
-                            .addComponent(lbSolrNote1)
-                            .addComponent(lbSolrNote2))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 57, Short.MAX_VALUE)
-                        .addComponent(bnTestSolr)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(lbTestSolr, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addGap(3, 3, 3))
+                        .addComponent(lbSolr4Settings)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(bnTestSolr4)
+                        .addGap(18, 18, 18)
+                        .addComponent(lbTestSolr4, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(tbSolr8Hostname)
                     .addComponent(tbSolr8Port)
                     .addComponent(tbSolr4Hostname)
                     .addComponent(tbSolr4Port)
                     .addComponent(tbZkHostname)
                     .addComponent(tbZkPort)
+                    .addGroup(pnSolrSettingsLayout.createSequentialGroup()
+                        .addComponent(lbZkSettings)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 164, Short.MAX_VALUE)
+                        .addComponent(bnTestZK)
+                        .addGap(18, 18, 18)
+                        .addComponent(lbTestZK, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(pnSolrSettingsLayout.createSequentialGroup()
+                        .addComponent(lbSolr8Settings)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(bnTestSolr8)
+                        .addGap(18, 18, 18)
+                        .addComponent(lbTestSolr8, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(pnSolrSettingsLayout.createSequentialGroup()
                         .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(lbTestSolrWarning)
-                            .addComponent(lbSolr4Settings)
-                            .addComponent(lbZkSettings))
+                            .addComponent(lbSolrNote1)
+                            .addComponent(lbSolrNote2)
+                            .addComponent(lbWarning))
                         .addGap(0, 0, Short.MAX_VALUE)))
                 .addContainerGap())
         );
@@ -396,31 +427,44 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
                 .addGap(8, 8, 8)
                 .addComponent(lbSolrNote1)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(lbSolrNote2)
-                .addGap(20, 20, 20)
-                .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                        .addComponent(lbSolr8Settings)
-                        .addComponent(bnTestSolr))
-                    .addComponent(lbTestSolr, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addGroup(pnSolrSettingsLayout.createSequentialGroup()
+                        .addComponent(lbSolrNote2)
+                        .addGap(28, 28, 28)
+                        .addComponent(lbSolr8Settings))
+                    .addGroup(pnSolrSettingsLayout.createSequentialGroup()
+                        .addComponent(lbTestSolr8, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addGap(5, 5, 5))
+                    .addComponent(bnTestSolr8))
+                .addGap(6, 6, 6)
                 .addComponent(tbSolr8Hostname, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(tbSolr8Port, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addGap(18, 18, 18)
-                .addComponent(lbSolr4Settings, javax.swing.GroupLayout.PREFERRED_SIZE, 21, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(tbSolr4Hostname, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(tbSolr4Port, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(lbZkSettings)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(tbZkHostname, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(tbZkPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(lbTestSolrWarning, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(pnSolrSettingsLayout.createSequentialGroup()
+                        .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                            .addComponent(lbSolr4Settings, javax.swing.GroupLayout.PREFERRED_SIZE, 21, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(bnTestSolr4))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(tbSolr4Hostname, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(tbSolr4Port, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                                .addComponent(lbZkSettings)
+                                .addComponent(bnTestZK))
+                            .addComponent(lbTestZK, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(tbZkHostname, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(tbZkPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(lbWarning, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(pnSolrSettingsLayout.createSequentialGroup()
+                        .addComponent(lbTestSolr4, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addGap(0, 0, Short.MAX_VALUE)))
                 .addContainerGap())
         );
 
@@ -546,7 +590,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
                         .addGap(18, 18, 18)
                         .addComponent(pnMessagingSettings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addComponent(pnSolrSettings, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                .addContainerGap(201, Short.MAX_VALUE))
+                .addContainerGap(234, Short.MAX_VALUE))
         );
 
         jScrollPane.setViewportView(pnOverallPanel);
@@ -555,7 +599,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 1191, Short.MAX_VALUE)
+            .addComponent(jScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 1250, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -583,12 +627,16 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
             tbOops.setText("");
             bnTestDatabase.setEnabled(false);
             lbTestDatabase.setIcon(null);
-            bnTestSolr.setEnabled(false);
-            lbTestSolr.setIcon(null);
+            bnTestSolr8.setEnabled(false);
+            lbTestSolr8.setIcon(null);
+            bnTestSolr4.setEnabled(false);
+            lbTestSolr4.setIcon(null);
+            bnTestZK.setEnabled(false);
+            lbTestZK.setIcon(null);
             bnTestMessageService.setEnabled(false);
             lbTestMessageService.setIcon(null);
             lbTestDbWarning.setText("");
-            lbTestSolrWarning.setText("");
+            lbWarning.setText("");
             lbTestMessageWarning.setText("");
         }
         enableMultiUserComponents(textBoxes, cbEnableMultiUser.isSelected());
@@ -653,68 +701,119 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
         }
     }//GEN-LAST:event_bnTestMessageServiceActionPerformed
 
-    private void bnTestSolrActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnTestSolrActionPerformed
-        lbTestSolr.setIcon(null);
-        lbTestSolr.paintImmediately(lbTestSolr.getVisibleRect());
-        lbTestSolrWarning.setText("");
-        lbTestSolrWarning.paintImmediately(lbTestSolrWarning.getVisibleRect());
+    private void bnTestSolr8ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnTestSolr8ActionPerformed
+        lbTestSolr8.setIcon(null);
+        lbTestSolr8.paintImmediately(lbTestSolr8.getVisibleRect());
+        lbWarning.setText("");
+        lbWarning.paintImmediately(lbWarning.getVisibleRect());
         setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
 
         KeywordSearchService kwsService = Lookup.getDefault().lookup(KeywordSearchService.class);
         try {
             if (kwsService != null) {
                 // test Solr 8 connectivity
-                if (!tbSolr8Port.getText().trim().isEmpty() && !tbSolr8Hostname.getText().trim().isEmpty()) {
-                    int port = Integer.parseInt(tbSolr8Port.getText().trim());
-                    kwsService.tryConnect(tbSolr8Hostname.getText().trim(), port);
-                }
-
-                // test Solr 4 conenctivity                
-                if (!tbSolr4Port.getText().trim().isEmpty() && !tbSolr4Hostname.getText().trim().isEmpty()) {
-                    int port = Integer.parseInt(tbSolr4Port.getText().trim());
-                    kwsService.tryConnect(tbSolr4Hostname.getText().trim(), port);
-                }
-
-                // test ZooKeeper connectivity (ZK settings are mandatory)
-                if (tbZkPort.getText().trim().isEmpty() || tbZkHostname.getText().trim().isEmpty()) {
-                    lbTestSolr.setIcon(badIcon);
-                    lbTestSolrWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.UnableToConnectToZK"));
+                if (tbSolr8Port.getText().trim().isEmpty() || tbSolr8Hostname.getText().trim().isEmpty()) {
+                    lbTestSolr8.setIcon(badIcon);
+                    lbWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.Solr8ConnectionInfoMissing.error"));
                     return;
                 }
-
-                if (false == CoordinationServiceUtils.isZooKeeperAccessible(tbZkHostname.getText().trim(), tbZkPort.getText().trim())) {
-                    lbTestSolr.setIcon(badIcon);
-                    lbTestSolrWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.UnableToConnectToZK"));
-                    return;
-                }
-
-                lbTestSolr.setIcon(goodIcon);
-                lbTestSolrWarning.setText("");
+                int port = Integer.parseInt(tbSolr8Port.getText().trim());
+                kwsService.tryConnect(tbSolr8Hostname.getText().trim(), port);
+                lbTestSolr8.setIcon(goodIcon);
+                lbWarning.setText("");
             } else {
-                lbTestSolr.setIcon(badIcon);
-                lbTestSolrWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.KeywordSearchNull"));
+                lbTestSolr8.setIcon(badIcon);
+                lbWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.KeywordSearchNull")); 
             }
         } catch (NumberFormatException ex) {
-            lbTestSolr.setIcon(badIcon);
-            lbTestSolrWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.InvalidPortNumber"));
+            lbTestSolr8.setIcon(badIcon);
+            lbWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.InvalidPortNumber"));
         } catch (KeywordSearchServiceException ex) {
-            lbTestSolr.setIcon(badIcon);
-            lbTestSolrWarning.setText(ex.getMessage());
-        } catch (InterruptedException | IOException ex) {
-            // ZK exceptions
-            lbTestSolr.setIcon(badIcon);
-            lbTestSolrWarning.setText(ex.getMessage());
+            lbTestSolr8.setIcon(badIcon);
+            lbWarning.setText(ex.getMessage());
         } finally {
             setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
         }
-    }//GEN-LAST:event_bnTestSolrActionPerformed
+    }//GEN-LAST:event_bnTestSolr8ActionPerformed
+
+    private void bnTestSolr4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnTestSolr4ActionPerformed
+        lbTestSolr4.setIcon(null);
+        lbTestSolr4.paintImmediately(lbTestSolr4.getVisibleRect());
+        lbWarning.setText("");
+        lbWarning.paintImmediately(lbWarning.getVisibleRect());
+        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+
+        KeywordSearchService kwsService = Lookup.getDefault().lookup(KeywordSearchService.class);
+        try {
+            if (kwsService != null) {
+                // test Solr 4 conenctivity                
+                if (tbSolr4Port.getText().trim().isEmpty() || tbSolr4Hostname.getText().trim().isEmpty()) {
+                    lbTestSolr4.setIcon(badIcon);
+                    lbWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.Solr4ConnectionInfoMissing.error"));
+                    return;
+                }
+                int port = Integer.parseInt(tbSolr4Port.getText().trim());
+                kwsService.tryConnect(tbSolr4Hostname.getText().trim(), port);
+                lbTestSolr4.setIcon(goodIcon);
+                lbWarning.setText("");
+            } else {
+                lbTestSolr4.setIcon(badIcon);
+                lbWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.KeywordSearchNull"));
+            }
+        } catch (NumberFormatException ex) {
+            lbTestSolr4.setIcon(badIcon);
+            lbWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.InvalidPortNumber"));
+        } catch (KeywordSearchServiceException ex) {
+            lbTestSolr4.setIcon(badIcon);
+            lbWarning.setText(ex.getMessage());
+        } finally {
+            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+        }
+    }//GEN-LAST:event_bnTestSolr4ActionPerformed
+
+    private void bnTestZKActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnTestZKActionPerformed
+        lbTestZK.setIcon(null);
+        lbTestZK.paintImmediately(lbTestZK.getVisibleRect());
+        lbWarning.setText("");
+        lbWarning.paintImmediately(lbWarning.getVisibleRect());
+        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+
+        try {
+            // test ZooKeeper connectivity (ZK settings are mandatory)
+            if (tbZkPort.getText().trim().isEmpty() || tbZkHostname.getText().trim().isEmpty()) {
+                lbTestZK.setIcon(badIcon);
+                lbWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.UnableToConnectToZK"));
+                return;
+            }
+
+            if (false == CoordinationServiceUtils.isZooKeeperAccessible(tbZkHostname.getText().trim(), tbZkPort.getText().trim())) {
+                lbTestZK.setIcon(badIcon);
+                lbWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.UnableToConnectToZK"));
+                return;
+            }
+
+            lbTestZK.setIcon(goodIcon);
+            lbWarning.setText("");
+        } catch (NumberFormatException ex) {
+            lbTestZK.setIcon(badIcon);
+            lbWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.InvalidPortNumber"));
+        } catch (InterruptedException | IOException ex) {
+            // ZK exceptions
+            lbTestZK.setIcon(badIcon);
+            lbWarning.setText(ex.getMessage());
+        } finally {
+            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+        }
+    }//GEN-LAST:event_bnTestZKActionPerformed
 
     void load() {
         lbTestDatabase.setIcon(null);
-        lbTestSolr.setIcon(null);
+        lbTestSolr8.setIcon(null);
+        lbTestSolr4.setIcon(null);
+        lbTestZK.setIcon(null);
         lbTestMessageService.setIcon(null);
         lbTestDbWarning.setText("");
-        lbTestSolrWarning.setText("");
+        lbWarning.setText("");
         lbTestMessageWarning.setText("");
 
         try {
@@ -739,12 +838,10 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
 
         populateSolrAndZkSettings();
 
-        lbTestDatabase.setIcon(null);
-        lbTestSolr.setIcon(null);
-        lbTestMessageService.setIcon(null);
-
         bnTestDatabase.setEnabled(false);
-        bnTestSolr.setEnabled(false);
+        bnTestSolr8.setEnabled(false);
+        bnTestSolr4.setEnabled(false);
+        bnTestZK.setEnabled(false);
         bnTestMessageService.setEnabled(false);
 
         cbEnableMultiUser.setSelected(UserPreferences.getIsMultiUserModeEnabled());
@@ -814,31 +911,49 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
 
     /**
      * Tests whether or not values have been entered in all of the mandatory
-     * Solr settings text fields. Test optional settings for completeness.
+     * Solr settings text fields. 
      *
      * @return True or false.
      */
-    private boolean solrFieldsArePopulated() {
-
-        // either Solr 8 or/and Solr 4 seetings must be specified
-        boolean solrConfigured = false;
-
-        // check if Solr 8 settings are set
-        if (!tbSolr8Hostname.getText().trim().isEmpty()
-                && !tbSolr8Port.getText().trim().isEmpty()) {
-            solrConfigured = true;
-        }
+    private boolean solr4FieldsArePopulated() {
 
         // check if Solr 4 settings are set
         if (!tbSolr4Hostname.getText().trim().isEmpty()
                 && !tbSolr4Port.getText().trim().isEmpty()) {
-            solrConfigured = true;
+            return true;
+        } else {
+            return false;
         }
-
-        // ZK settings are mandatory    
-        return (solrConfigured && !tbZkHostname.getText().trim().isEmpty()
-                && !tbZkPort.getText().trim().isEmpty());
     }
+    
+    /**
+     * Tests whether or not values have been entered in all of the mandatory
+     * Solr settings text fields. 
+     *
+     * @return True or false.
+     */
+    private boolean solr8FieldsArePopulated() {
+
+        // check if Solr 8 settings are set
+        if (!tbSolr8Hostname.getText().trim().isEmpty()
+                && !tbSolr8Port.getText().trim().isEmpty()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    
+    /**
+     * Tests whether or not values have been entered in all of the mandatory
+     * ZK settings text fields. 
+     *
+     * @return True or false.
+     */
+    private boolean ZooKeeperFieldsArePopulated() {
+        // check if ZK settings are set
+        return (!tbZkHostname.getText().trim().isEmpty()
+                && !tbZkPort.getText().trim().isEmpty());
+    }    
 
     /**
      * Tests whether or not values have been entered in all of the required
@@ -1004,19 +1119,25 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
         boolean result = true;
 
         boolean dbPopulated = databaseFieldsArePopulated();
-        boolean solrPopulated = solrFieldsArePopulated();
+        boolean solr4Populated = solr4FieldsArePopulated();
+        boolean solr8Populated = solr8FieldsArePopulated();
+        boolean zkPopulated = ZooKeeperFieldsArePopulated();
         boolean messageServicePopulated = messageServiceFieldsArePopulated();
 
         // PostgreSQL Database
         bnTestDatabase.setEnabled(dbPopulated);
 
         // Solr Indexing
-        bnTestSolr.setEnabled(solrPopulated);
+        bnTestSolr8.setEnabled(solr8Populated);
+        bnTestSolr4.setEnabled(solr4Populated);
+        bnTestZK.setEnabled(zkPopulated);
 
         // ActiveMQ Messaging
         bnTestMessageService.setEnabled(messageServicePopulated);
 
-        if (!dbPopulated || !solrPopulated || !messageServicePopulated) {
+        if (dbPopulated && messageServicePopulated && zkPopulated && (solr8Populated || solr4Populated)) {
+            result = true;
+        } else {
             // We don't even have everything filled out
             result = false;
             tbOops.setText(INCOMPLETE_SETTINGS_MSG);
@@ -1133,7 +1254,9 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton bnTestDatabase;
     private javax.swing.JButton bnTestMessageService;
-    private javax.swing.JButton bnTestSolr;
+    private javax.swing.JButton bnTestSolr4;
+    private javax.swing.JButton bnTestSolr8;
+    private javax.swing.JButton bnTestZK;
     private javax.swing.JCheckBox cbEnableMultiUser;
     private javax.swing.JScrollPane jScrollPane;
     private javax.swing.JLabel lbDatabaseSettings;
@@ -1146,8 +1269,10 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
     private javax.swing.JLabel lbTestDbWarning;
     private javax.swing.JLabel lbTestMessageService;
     private javax.swing.JLabel lbTestMessageWarning;
-    private javax.swing.JLabel lbTestSolr;
-    private javax.swing.JLabel lbTestSolrWarning;
+    private javax.swing.JLabel lbTestSolr4;
+    private javax.swing.JLabel lbTestSolr8;
+    private javax.swing.JLabel lbTestZK;
+    private javax.swing.JLabel lbWarning;
     private javax.swing.JLabel lbZkSettings;
     private javax.swing.JPanel pnDatabaseSettings;
     private javax.swing.JPanel pnMessagingSettings;