diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbManager.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbManager.java
index b0f288673b..fbdb4ea51e 100755
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbManager.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbManager.java
@@ -382,6 +382,26 @@ public class CentralRepoDbManager {
         CentralRepoDbUtil.setUseCentralRepo(true);
         saveNewCentralRepo();
     }
+    
+    public void setupDefaultPostgresDb() throws CentralRepoException {
+        assert UserPreferences.getIsMultiUserModeEnabled();
+        
+        selectedDbChoice = CentralRepoDbChoice.POSTGRESQL_MULTIUSER;
+        DatabaseTestResult curStatus = testStatus();
+        if (curStatus == DatabaseTestResult.DB_DOES_NOT_EXIST) {
+            createDb();
+            curStatus = testStatus();
+        }
+
+        // the only successful setup status is tested ok
+        if (curStatus != DatabaseTestResult.TESTED_OK) {
+            throw new CentralRepoException("Unable to successfully create sqlite database");
+        }
+
+        // if successfully got here, then save the settings
+        CentralRepoDbUtil.setUseCentralRepo(true);
+        saveNewCentralRepo();
+    }
 
     /**
      * This method returns if changes to the central repository configuration
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED
index d4cca6c407..e95a759c4f 100755
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED
@@ -1,4 +1,10 @@
 caseeventlistener.evidencetag=Evidence
+CentralRepositoryNotificationDialog.bulletHeader=This data is used to:
+CentralRepositoryNotificationDialog.bulletOne=Ignore common items (files, domains, and accounts)
+CentralRepositoryNotificationDialog.bulletThree=Create personas that group accounts
+CentralRepositoryNotificationDialog.bulletTwo=Identify where an item was previously seen
+CentralRepositoryNotificationDialog.finalRemarks=To limit what is stored, use the Central Repository options panel.
+CentralRepositoryNotificationDialog.header=Autopsy stores data about each case in its Central Repository.
 IngestEventsListener.ingestmodule.name=Central Repository
 IngestEventsListener.prevCaseComment.text=Previous Case: 
 # {0} - typeName
@@ -7,6 +13,3 @@ IngestEventsListener.prevCount.text=Number of previous {0}: {1}
 IngestEventsListener.prevExists.text=Previously Seen Devices (Central Repository)
 IngestEventsListener.prevTaggedSet.text=Previously Tagged As Notable (Central Repository)
 Installer.centralRepoUpgradeFailed.title=Central repository disabled
-Installer.initialCreateSqlite.messageDesc=It will store information about all hashes and identifiers that you process. You can use this to ignore previously seen files and make connections between cases.
-Installer.initialCreateSqlite.messageHeader=The Central Repository is not enabled. Would you like to enable it?
-Installer.initialCreateSqlite.title=Enable Central Repository?
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CentralRepositoryNotificationDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CentralRepositoryNotificationDialog.java
new file mode 100755
index 0000000000..883d979c90
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CentralRepositoryNotificationDialog.java
@@ -0,0 +1,73 @@
+/*
+ * Central Repository
+ *
+ * Copyright 2020 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.centralrepository.eventlisteners;
+
+import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.core.RuntimeProperties;
+import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
+import org.sleuthkit.autopsy.coreutils.Version;
+
+/**
+ * Notifies new installations or old upgrades that the central repository will
+ * be enabled by default.
+ */
+public class CentralRepositoryNotificationDialog {
+
+    /**
+     * This dialog should display iff the mode is RELEASE and the
+     * application is running with a GUI.
+     */
+    static boolean shouldDisplay() {
+        return Version.getBuildType() == Version.Type.RELEASE 
+                && RuntimeProperties.runningWithGUI();
+    }
+
+    /**
+     * Displays an informational modal dialog to the user, which is dismissed by
+     * pressing 'OK'.
+     */
+    @NbBundle.Messages({
+        "CentralRepositoryNotificationDialog.header=Autopsy stores data about each case in its Central Repository.",
+        "CentralRepositoryNotificationDialog.bulletHeader=This data is used to:",
+        "CentralRepositoryNotificationDialog.bulletOne=Ignore common items (files, domains, and accounts)",
+        "CentralRepositoryNotificationDialog.bulletTwo=Identify where an item was previously seen",
+        "CentralRepositoryNotificationDialog.bulletThree=Create personas that group accounts",
+        "CentralRepositoryNotificationDialog.finalRemarks=To limit what is stored, use the Central Repository options panel."
+    })
+    static void display() {
+        assert shouldDisplay();
+
+        MessageNotifyUtil.Message.info(
+                "<html>"
+                + "<body>"
+                    + "<div>"
+                        + "<p>" + Bundle.CentralRepositoryNotificationDialog_header() + "</p>"
+                        + "<p>" + Bundle.CentralRepositoryNotificationDialog_bulletHeader() + "</p>"
+                        + "<ul>"
+                            + "<li>" + Bundle.CentralRepositoryNotificationDialog_bulletOne() + "</li>"
+                            + "<li>" + Bundle.CentralRepositoryNotificationDialog_bulletTwo() + "</li>"
+                            + "<li>" + Bundle.CentralRepositoryNotificationDialog_bulletThree() + "</li>"
+                        + "</ul>"
+                        + "<p>" + Bundle.CentralRepositoryNotificationDialog_finalRemarks() + "</p>"
+                    + "</div>"
+                + "</body>"
+                + "</html>"
+        );
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Installer.java b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Installer.java
index d4f0253cd2..5662199181 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Installer.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Installer.java
@@ -25,14 +25,12 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import org.openide.modules.ModuleInstall;
 import org.openide.util.NbBundle;
-import org.openide.windows.WindowManager;
-import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoDbManager;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException;
 import org.sleuthkit.autopsy.core.RuntimeProperties;
+import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
-import org.sleuthkit.autopsy.coreutils.Version;
 
 /**
  * Adds/removes application event listeners responsible for adding data to the
@@ -81,19 +79,10 @@ public class Installer extends ModuleInstall {
      * the org.sleuthkit.autopsy.core package when the already installed
      * Autopsy-Core module is restored (during application startup).
      */
-    @NbBundle.Messages({
-        "Installer.initialCreateSqlite.title=Enable Central Repository?",
-        "Installer.initialCreateSqlite.messageHeader=The Central Repository is not enabled. Would you like to enable it?",
-        "Installer.initialCreateSqlite.messageDesc=It will store information about all hashes and identifiers that you process. "
-        + "You can use this to ignore previously seen files and make connections between cases."
-    })
     @Override
     public void restored() {
         addApplicationEventListeners();
-
-        if (Version.getBuildType() == Version.Type.RELEASE) {
-            setupDefaultCentralRepository();
-        }
+        setupDefaultCentralRepository();
     }
 
     /**
@@ -107,9 +96,9 @@ public class Installer extends ModuleInstall {
 
     /**
      * Checks if the central repository has been set up and configured. If not,
-     * either offers to perform set up (running with a GUI) or does the set up
-     * unconditionally (not running with a GUI, e.g., in an automated ingest
-     * node).
+     * does the set up unconditionally. If the application is running with a
+     * GUI, a notification will be displayed to the user if the mode is RELEASE
+     * (in other words, developers are exempt from seeing the notification).
      */
     private void setupDefaultCentralRepository() {
         Map<String, String> centralRepoSettings = ModuleSettings.getConfigSettings("CentralRepository");
@@ -127,62 +116,29 @@ public class Installer extends ModuleInstall {
                 ModuleSettings.setConfigSetting("CentralRepository", "initialized", "true");
             }
         }
-
-        // if central repository hasn't been previously initialized, initialize it
-        if (!initialized) {
-            // if running with a GUI, prompt the user
-            if (RuntimeProperties.runningWithGUI()) {
-                try {
-                    SwingUtilities.invokeAndWait(() -> {
-                        try {
-                            String dialogText
-                                    = "<html><body>"
-                                    + "<div style='width: 400px;'>"
-                                    + "<p>" + NbBundle.getMessage(this.getClass(), "Installer.initialCreateSqlite.messageHeader") + "</p>"
-                                    + "<p style='margin-top: 10px'>" + NbBundle.getMessage(this.getClass(), "Installer.initialCreateSqlite.messageDesc") + "</p>"
-                                    + "</div>"
-                                    + "</body></html>";
-
-                            if (JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(WindowManager.getDefault().getMainWindow(),
-                                    dialogText,
-                                    NbBundle.getMessage(this.getClass(), "Installer.initialCreateSqlite.title"),
-                                    JOptionPane.YES_NO_OPTION)) {
-
-                                setupDefaultSqliteCentralRepo();
-                            }
-                        } catch (CentralRepoException ex) {
-                            logger.log(Level.SEVERE, "There was an error while initializing the central repository database", ex);
-
-                            doMessageBoxIfRunningInGUI(ex);
-                        }
-                    });
-                } catch (InterruptedException | InvocationTargetException ex) {
-                    logger.log(Level.SEVERE, "There was an error while running the swing utility invoke later while creating the central repository database", ex);
-                }
-            } // if no GUI, just initialize
-            else {
-                try {
-                    setupDefaultSqliteCentralRepo();
-                } catch (CentralRepoException ex) {
-                    logger.log(Level.SEVERE, "There was an error while initializing the central repository database", ex);
-
-                    doMessageBoxIfRunningInGUI(ex);
-                }
-            }
-
-            ModuleSettings.setConfigSetting("CentralRepository", "initialized", "true");
+        
+        if(initialized) {
+            return; // Nothing to do
         }
-    }
 
-    /**
-     * Sets up a default single-user SQLite central repository.
-     *
-     * @throws CentralRepoException If there is an error setting up teh central
-     *                              repository.
-     */
-    private void setupDefaultSqliteCentralRepo() throws CentralRepoException {
-        CentralRepoDbManager manager = new CentralRepoDbManager();
-        manager.setupDefaultSqliteDb();
+        if (CentralRepositoryNotificationDialog.shouldDisplay()) {
+            CentralRepositoryNotificationDialog.display();
+        }
+
+        try {
+            CentralRepoDbManager manager = new CentralRepoDbManager();
+            if (UserPreferences.getIsMultiUserModeEnabled()) {
+                manager.setupDefaultPostgresDb();
+            } else {
+                manager.setupDefaultSqliteDb();
+            }
+        } catch (CentralRepoException ex) {
+            logger.log(Level.SEVERE, "There was an error while initializing the central repository database", ex);
+
+            doMessageBoxIfRunningInGUI(ex);
+        }
+
+        ModuleSettings.setConfigSetting("CentralRepository", "initialized", "true");
     }
 
     /**