diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
index 60db8edaf8..186864c2e4 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
@@ -4,7 +4,6 @@ CTL_CaseCloseAct=Close Case
 CTL_CaseNewAction=New Case
 CTL_CasePropertiesAction=Case Properties
 CTL_CaseDeleteAction=Delete Case
-CTL_CaseOpenAction=Open Case
 Menu/Case/OpenRecentCase=Open Recent Case
 CTL_CaseDeleteAction=Delete Case
 OpenIDE-Module-Name=Case
@@ -210,14 +209,9 @@ CasePropertiesPanel.lbDbName.text=Database Name:
 CasePropertiesPanel.lbDbType.text=Case Type:
 CasePropertiesPanel.caseNumberLabel.text=Case Number:
 LocalDiskPanel.changeDatabasePathCheckbox.text=Update case to use VHD file upon completion
-CueBannerPanel.openMultiUserCaseButton.text=
-CueBannerPanel.openExistingCaseButton.text=
 CueBannerPanel.openRecentCaseButton.text=
 CueBannerPanel.createNewCaseButton.text=
-CueBannerPanel.createNewCaseLabel.text=Create New Case
 CueBannerPanel.openRecentCaseLabel.text=Open Recent Case
-CueBannerPanel.openExistingCaseLabel.text=Open Existing Case
-CueBannerPanel.openMultiUserCaseLabel.text=Open Multi-User Case
 ReviewModeCasePanel.cannotOpenCase=Cannot Open Case
 ReviewModeCasePanel.casePathNotFound=Case path not found
 ReviewModeCasePanel.caseIsLocked=Single-user case is locked.
@@ -239,3 +233,8 @@ MultiUserCasesPanel.bnRefresh.text=&Refresh
 MultiUserCasesPanel.bnOpen.text=&Open
 MultiUserCasesPanel.rbGroupLabel.text=Show cases accessed in the last 10:
 MultiUserCasesPanel.rbMonths.text=Months
+CueBannerPanel.primaryOpenCaseButton.text=
+CueBannerPanel.secondaryOpenCaseButton.text=
+CueBannerPanel.primaryOpenCaseLabel.text=Open Multi-User Case
+CueBannerPanel.secondaryOpenCaseLabel.text=Open Single-User Case
+CueBannerPanel.newCaseLabel.text=New Case
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties
index de333e790f..7e70df3316 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties
@@ -190,10 +190,10 @@ CasePropertiesPanel.caseNumberLabel.text=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
 CasePropertiesPanel.examinerLabel.text=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
 OptionalCasePropertiesPanel.examinerLabel.text=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
 OptionalCasePropertiesPanel.caseDisplayNameLabel.text=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
-CueBannerPanel.createNewCaseLabel.text=\u65b0\u898f\u30b1\u30fc\u30b9\u3092\u4f5c\u6210
 CueBannerPanel.openRecentCaseLabel.text=\u6700\u8fd1\u958b\u3044\u305f\u30b1\u30fc\u30b9\u3092\u958b\u304f
-CueBannerPanel.openExistingCaseLabel.text=\u65e2\u5b58\u30b1\u30fc\u30b9\u3092\u958b\u304f
 CueBannerPanel.openAutoIngestCaseLabel.text=\u65e2\u5b58\u30b1\u30fc\u30b9\u3092\u958b\u304f
 OpenMultiUserCasePanel.openButton.text=\u958b\u304f
 OpenMultiUserCasePanel.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
 OpenMultiUserCasePanel.jLabel1.text=\u6700\u8fd1\u958b\u3044\u305f\u30d5\u30a1\u30a4\u30eb
+CueBannerPanel.primaryOpenCaseLabel.text=\u65e2\u5b58\u30b1\u30fc\u30b9\u3092\u958b\u304f
+CueBannerPanel.newCaseLabel.text=\u65b0\u898f\u30b1\u30fc\u30b9\u3092\u4f5c\u6210
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java
index e4ed92d897..1237b5600e 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java
@@ -29,12 +29,16 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 import javax.swing.filechooser.FileFilter;
 import javax.swing.filechooser.FileNameExtensionFilter;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.lookup.ServiceProvider;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.actions.IngestRunningCheck;
+import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.Version;
@@ -46,6 +50,13 @@ import org.sleuthkit.autopsy.coreutils.Version;
  *
  * This action should only be invoked in the event dispatch thread (EDT).
  */
+@ActionID(category = "Case", id = "org.sleuthkit.autopsy.casemodule.CaseOpenAction")
+@ActionReference(path = "Menu/Case", position = 103)
+@ActionRegistration(displayName = "#CTL_CaseOpenAction", lazy = false)
+@NbBundle.Messages({
+    "CTL_CaseOpenAction=Open Case",
+    "CTL_CaseOpenSingleUserAction=Open Single-User Case"
+})
 @ServiceProvider(service = CaseOpenAction.class)
 public final class CaseOpenAction extends CallableSystemAction implements ActionListener {
 
@@ -141,7 +152,15 @@ public final class CaseOpenAction extends CallableSystemAction implements Action
 
     @Override
     public String getName() {
-        return NbBundle.getMessage(CaseOpenAction.class, "CTL_CaseOpenAction");
+        String name;
+        
+        if(UserPreferences.getIsMultiUserModeEnabled()) {
+            name = Bundle.CTL_CaseOpenSingleUserAction();
+        } else {
+            name = Bundle.CTL_CaseOpenAction();
+        }
+        
+        return name;
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form
index 0d6525db8b..4e347413ad 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form
@@ -27,15 +27,15 @@
                       <Group type="103" groupAlignment="2" attributes="0">
                           <Component id="createNewCaseButton" alignment="2" min="-2" max="-2" attributes="1"/>
                           <Component id="openRecentCaseButton" alignment="2" min="-2" pref="70" max="-2" attributes="1"/>
-                          <Component id="openExistingCaseButton" alignment="2" min="-2" max="-2" attributes="1"/>
-                          <Component id="openMultiUserCaseButton" alignment="2" min="-2" max="-2" attributes="1"/>
+                          <Component id="primaryOpenCaseButton" alignment="2" min="-2" max="-2" attributes="1"/>
+                          <Component id="secondaryOpenCaseButton" alignment="2" min="-2" max="-2" attributes="1"/>
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="createNewCaseLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="newCaseLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Component id="openRecentCaseLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Component id="openExistingCaseLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Component id="openMultiUserCaseLabel" min="-2" max="-2" attributes="0"/>
+                          <Component id="primaryOpenCaseLabel" alignment="0" max="-2" attributes="0"/>
+                          <Component id="secondaryOpenCaseLabel" min="-2" max="-2" attributes="0"/>
                       </Group>
                   </Group>
                   <Component id="closeButton" alignment="1" min="-2" pref="73" max="-2" attributes="0"/>
@@ -52,7 +52,7 @@
                   <Group type="102" attributes="0">
                       <Group type="103" groupAlignment="2" attributes="0">
                           <Component id="createNewCaseButton" alignment="2" min="-2" pref="56" max="-2" attributes="0"/>
-                          <Component id="createNewCaseLabel" alignment="2" min="-2" max="-2" attributes="0"/>
+                          <Component id="newCaseLabel" alignment="2" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="2" attributes="0">
@@ -61,14 +61,14 @@
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="2" attributes="0">
-                          <Component id="openExistingCaseButton" alignment="2" min="-2" pref="58" max="-2" attributes="0"/>
-                          <Component id="openExistingCaseLabel" alignment="2" min="-2" max="-2" attributes="0"/>
+                          <Component id="primaryOpenCaseButton" alignment="2" min="-2" pref="58" max="-2" attributes="0"/>
+                          <Component id="primaryOpenCaseLabel" alignment="2" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace max="32767" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="openMultiUserCaseButton" alignment="1" min="-2" pref="58" max="-2" attributes="0"/>
+                          <Component id="secondaryOpenCaseButton" alignment="1" min="-2" pref="58" max="-2" attributes="0"/>
                           <Group type="102" alignment="1" attributes="0">
-                              <Component id="openMultiUserCaseLabel" min="-2" max="-2" attributes="0"/>
+                              <Component id="secondaryOpenCaseLabel" min="-2" max="-2" attributes="0"/>
                               <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
                           </Group>
                       </Group>
@@ -76,7 +76,7 @@
                   <Component id="jSeparator1" alignment="0" max="32767" attributes="0"/>
                   <Component id="autopsyLogo" alignment="0" min="-2" pref="257" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="10" max="32767" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
               <Component id="closeButton" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
@@ -139,15 +139,15 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="openRecentCaseButtonActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JLabel" name="createNewCaseLabel">
+    <Component class="javax.swing.JLabel" name="newCaseLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
           <FontInfo relative="true">
-            <Font bold="false" component="createNewCaseLabel" property="font" relativeSize="false" size="13"/>
+            <Font bold="false" component="newCaseLabel" property="font" relativeSize="false" size="13"/>
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.createNewCaseLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.newCaseLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -163,13 +163,13 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JButton" name="openExistingCaseButton">
+    <Component class="javax.swing.JButton" name="primaryOpenCaseButton">
       <Properties>
         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
           <Image iconType="3" name="/org/sleuthkit/autopsy/casemodule/btn_icon_open_existing.png"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.openExistingCaseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.primaryOpenCaseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
           <Connection code="null" type="code"/>
@@ -184,18 +184,18 @@
         </Property>
       </Properties>
       <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="openExistingCaseButtonActionPerformed"/>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="primaryOpenCaseButtonActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JLabel" name="openExistingCaseLabel">
+    <Component class="javax.swing.JLabel" name="primaryOpenCaseLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
           <FontInfo relative="true">
-            <Font bold="false" component="openExistingCaseLabel" property="font" relativeSize="false" size="13"/>
+            <Font bold="false" component="primaryOpenCaseLabel" property="font" relativeSize="false" size="13"/>
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.openExistingCaseLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.primaryOpenCaseLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -216,13 +216,13 @@
         <Property name="orientation" type="int" value="1"/>
       </Properties>
     </Component>
-    <Component class="javax.swing.JButton" name="openMultiUserCaseButton">
+    <Component class="javax.swing.JButton" name="secondaryOpenCaseButton">
       <Properties>
         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
           <Image iconType="3" name="/org/sleuthkit/autopsy/casemodule/btn_icon_open_existing.png"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.openMultiUserCaseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.secondaryOpenCaseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
           <Connection code="null" type="code"/>
@@ -237,18 +237,18 @@
         </Property>
       </Properties>
       <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="openMultiUserCaseButtonActionPerformed"/>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="secondaryOpenCaseButtonActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JLabel" name="openMultiUserCaseLabel">
+    <Component class="javax.swing.JLabel" name="secondaryOpenCaseLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
           <FontInfo relative="true">
-            <Font bold="false" component="openMultiUserCaseLabel" property="font" relativeSize="false" size="13"/>
+            <Font bold="false" component="secondaryOpenCaseLabel" property="font" relativeSize="false" size="13"/>
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.openMultiUserCaseLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.secondaryOpenCaseLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
index 2c81d100e4..4d0fbd5abc 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
@@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.casemodule;
 
 import java.awt.Dialog;
 import java.awt.Dimension;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -107,9 +108,15 @@ public class CueBannerPanel extends javax.swing.JPanel {
         openRecentCaseButton.setEnabled(enableOpenRecentCaseButton);
         openRecentCaseLabel.setEnabled(enableOpenRecentCaseButton);
         
-        boolean enableOpenMultiUserCaseButton = UserPreferences.getIsMultiUserModeEnabled();
-        openMultiUserCaseButton.setEnabled(enableOpenMultiUserCaseButton);
-        openMultiUserCaseLabel.setEnabled(enableOpenMultiUserCaseButton);
+        if(UserPreferences.getIsMultiUserModeEnabled()) {
+            primaryOpenCaseLabel.setText("Open Multi-User Case");
+            secondaryOpenCaseButton.setVisible(true);
+            secondaryOpenCaseLabel.setVisible(true);
+        } else {
+            primaryOpenCaseLabel.setText("Open Case");
+            secondaryOpenCaseButton.setVisible(false);
+            secondaryOpenCaseLabel.setVisible(false);
+        }
     }
 
     /**
@@ -125,14 +132,14 @@ public class CueBannerPanel extends javax.swing.JPanel {
         this.autopsyLogo.setText("");
         createNewCaseButton = new javax.swing.JButton();
         openRecentCaseButton = new javax.swing.JButton();
-        createNewCaseLabel = new javax.swing.JLabel();
+        newCaseLabel = new javax.swing.JLabel();
         openRecentCaseLabel = new javax.swing.JLabel();
-        openExistingCaseButton = new javax.swing.JButton();
-        openExistingCaseLabel = new javax.swing.JLabel();
+        primaryOpenCaseButton = new javax.swing.JButton();
+        primaryOpenCaseLabel = new javax.swing.JLabel();
         closeButton = new javax.swing.JButton();
         jSeparator1 = new javax.swing.JSeparator();
-        openMultiUserCaseButton = new javax.swing.JButton();
-        openMultiUserCaseLabel = new javax.swing.JLabel();
+        secondaryOpenCaseButton = new javax.swing.JButton();
+        secondaryOpenCaseLabel = new javax.swing.JLabel();
 
         autopsyLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/welcome_logo.png"))); // NOI18N
         autopsyLogo.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.autopsyLogo.text")); // NOI18N
@@ -161,48 +168,48 @@ public class CueBannerPanel extends javax.swing.JPanel {
             }
         });
 
-        createNewCaseLabel.setFont(createNewCaseLabel.getFont().deriveFont(createNewCaseLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 13));
-        createNewCaseLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.createNewCaseLabel.text")); // NOI18N
+        newCaseLabel.setFont(newCaseLabel.getFont().deriveFont(newCaseLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 13));
+        newCaseLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.newCaseLabel.text")); // NOI18N
 
         openRecentCaseLabel.setFont(openRecentCaseLabel.getFont().deriveFont(openRecentCaseLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 13));
         openRecentCaseLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openRecentCaseLabel.text")); // NOI18N
 
-        openExistingCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_existing.png"))); // NOI18N
-        openExistingCaseButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openExistingCaseButton.text")); // NOI18N
-        openExistingCaseButton.setBorder(null);
-        openExistingCaseButton.setBorderPainted(false);
-        openExistingCaseButton.setContentAreaFilled(false);
-        openExistingCaseButton.setMargin(new java.awt.Insets(1, 1, 1, 1));
-        openExistingCaseButton.setPreferredSize(new java.awt.Dimension(64, 64));
-        openExistingCaseButton.addActionListener(new java.awt.event.ActionListener() {
+        primaryOpenCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_existing.png"))); // NOI18N
+        primaryOpenCaseButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.primaryOpenCaseButton.text")); // NOI18N
+        primaryOpenCaseButton.setBorder(null);
+        primaryOpenCaseButton.setBorderPainted(false);
+        primaryOpenCaseButton.setContentAreaFilled(false);
+        primaryOpenCaseButton.setMargin(new java.awt.Insets(1, 1, 1, 1));
+        primaryOpenCaseButton.setPreferredSize(new java.awt.Dimension(64, 64));
+        primaryOpenCaseButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-                openExistingCaseButtonActionPerformed(evt);
+                primaryOpenCaseButtonActionPerformed(evt);
             }
         });
 
-        openExistingCaseLabel.setFont(openExistingCaseLabel.getFont().deriveFont(openExistingCaseLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 13));
-        openExistingCaseLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openExistingCaseLabel.text")); // NOI18N
+        primaryOpenCaseLabel.setFont(primaryOpenCaseLabel.getFont().deriveFont(primaryOpenCaseLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 13));
+        primaryOpenCaseLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.primaryOpenCaseLabel.text")); // NOI18N
 
         closeButton.setFont(closeButton.getFont().deriveFont(closeButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         closeButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.closeButton.text")); // NOI18N
 
         jSeparator1.setOrientation(javax.swing.SwingConstants.VERTICAL);
 
-        openMultiUserCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_existing.png"))); // NOI18N
-        openMultiUserCaseButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openMultiUserCaseButton.text")); // NOI18N
-        openMultiUserCaseButton.setBorder(null);
-        openMultiUserCaseButton.setBorderPainted(false);
-        openMultiUserCaseButton.setContentAreaFilled(false);
-        openMultiUserCaseButton.setMargin(new java.awt.Insets(1, 1, 1, 1));
-        openMultiUserCaseButton.setPreferredSize(new java.awt.Dimension(64, 64));
-        openMultiUserCaseButton.addActionListener(new java.awt.event.ActionListener() {
+        secondaryOpenCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_existing.png"))); // NOI18N
+        secondaryOpenCaseButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.secondaryOpenCaseButton.text")); // NOI18N
+        secondaryOpenCaseButton.setBorder(null);
+        secondaryOpenCaseButton.setBorderPainted(false);
+        secondaryOpenCaseButton.setContentAreaFilled(false);
+        secondaryOpenCaseButton.setMargin(new java.awt.Insets(1, 1, 1, 1));
+        secondaryOpenCaseButton.setPreferredSize(new java.awt.Dimension(64, 64));
+        secondaryOpenCaseButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-                openMultiUserCaseButtonActionPerformed(evt);
+                secondaryOpenCaseButtonActionPerformed(evt);
             }
         });
 
-        openMultiUserCaseLabel.setFont(openMultiUserCaseLabel.getFont().deriveFont(openMultiUserCaseLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 13));
-        openMultiUserCaseLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openMultiUserCaseLabel.text")); // NOI18N
+        secondaryOpenCaseLabel.setFont(secondaryOpenCaseLabel.getFont().deriveFont(secondaryOpenCaseLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 13));
+        secondaryOpenCaseLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.secondaryOpenCaseLabel.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
@@ -219,14 +226,14 @@ public class CueBannerPanel extends javax.swing.JPanel {
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                             .addComponent(createNewCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                             .addComponent(openRecentCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(openExistingCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(openMultiUserCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                            .addComponent(primaryOpenCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(secondaryOpenCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(createNewCaseLabel)
+                            .addComponent(newCaseLabel)
                             .addComponent(openRecentCaseLabel)
-                            .addComponent(openExistingCaseLabel)
-                            .addComponent(openMultiUserCaseLabel)))
+                            .addComponent(primaryOpenCaseLabel)
+                            .addComponent(secondaryOpenCaseLabel)))
                     .addComponent(closeButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 73, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap())
         );
@@ -238,24 +245,24 @@ public class CueBannerPanel extends javax.swing.JPanel {
                     .addGroup(layout.createSequentialGroup()
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                             .addComponent(createNewCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 56, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(createNewCaseLabel))
+                            .addComponent(newCaseLabel))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                             .addComponent(openRecentCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE)
                             .addComponent(openRecentCaseLabel))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                            .addComponent(openExistingCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 58, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(openExistingCaseLabel))
+                            .addComponent(primaryOpenCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 58, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(primaryOpenCaseLabel))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(openMultiUserCaseButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 58, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(secondaryOpenCaseButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 58, javax.swing.GroupLayout.PREFERRED_SIZE)
                             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                                .addComponent(openMultiUserCaseLabel)
+                                .addComponent(secondaryOpenCaseLabel)
                                 .addGap(20, 20, 20))))
                     .addComponent(jSeparator1)
                     .addComponent(autopsyLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 257, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 10, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addComponent(closeButton)
                 .addContainerGap())
         );
@@ -265,9 +272,15 @@ public class CueBannerPanel extends javax.swing.JPanel {
         Lookup.getDefault().lookup(CaseNewActionInterface.class).actionPerformed(evt);
     }//GEN-LAST:event_createNewCaseButtonActionPerformed
 
-    private void openExistingCaseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_openExistingCaseButtonActionPerformed
-        Lookup.getDefault().lookup(CaseOpenAction.class).actionPerformed(evt);
-    }//GEN-LAST:event_openExistingCaseButtonActionPerformed
+    private void primaryOpenCaseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_primaryOpenCaseButtonActionPerformed
+        if(UserPreferences.getIsMultiUserModeEnabled()) {
+            MultiUserCasesDialog multiUserCaseWindow = MultiUserCasesDialog.getInstance();
+            multiUserCaseWindow.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
+            multiUserCaseWindow.setVisible(true);
+        } else {
+            Lookup.getDefault().lookup(CaseOpenAction.class).actionPerformed(evt);
+        }
+    }//GEN-LAST:event_primaryOpenCaseButtonActionPerformed
 
     private void openRecentCaseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_openRecentCaseButtonActionPerformed
         recentCasesWindow.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
@@ -275,24 +288,22 @@ public class CueBannerPanel extends javax.swing.JPanel {
         recentCasesWindow.setVisible(true);
     }//GEN-LAST:event_openRecentCaseButtonActionPerformed
 
-    private void openMultiUserCaseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_openMultiUserCaseButtonActionPerformed
-        MultiUserCasesDialog multiUserCaseWindow = MultiUserCasesDialog.getInstance();
-        multiUserCaseWindow.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
-        multiUserCaseWindow.setVisible(true);
-    }//GEN-LAST:event_openMultiUserCaseButtonActionPerformed
+    private void secondaryOpenCaseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_secondaryOpenCaseButtonActionPerformed
+        Lookup.getDefault().lookup(CaseOpenAction.class).actionPerformed(evt);
+    }//GEN-LAST:event_secondaryOpenCaseButtonActionPerformed
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JLabel autopsyLogo;
     private javax.swing.JButton closeButton;
     private javax.swing.JButton createNewCaseButton;
-    private javax.swing.JLabel createNewCaseLabel;
     private javax.swing.JSeparator jSeparator1;
-    private javax.swing.JButton openMultiUserCaseButton;
-    private javax.swing.JLabel openMultiUserCaseLabel;
-    private javax.swing.JButton openExistingCaseButton;
-    private javax.swing.JLabel openExistingCaseLabel;
+    private javax.swing.JLabel newCaseLabel;
     private javax.swing.JButton openRecentCaseButton;
     private javax.swing.JLabel openRecentCaseLabel;
+    private javax.swing.JButton primaryOpenCaseButton;
+    private javax.swing.JLabel primaryOpenCaseLabel;
+    private javax.swing.JButton secondaryOpenCaseButton;
+    private javax.swing.JLabel secondaryOpenCaseLabel;
     // End of variables declaration//GEN-END:variables
 
 }
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index fb5618c6e6..9939e747b6 100755
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -49,12 +49,6 @@
             </file>
             <file name="org-sleuthkit-autopsy-casemodule-CasePropertiesAction.instance"/>
             <file name="org-sleuthkit-autopsy-casemodule-CaseDeleteAction.instance"/>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseOpenAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseOpenAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_CaseOpenAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
             <file name="org-sleuthkit-autopsy-casemodule-CaseSaveAction.instance">
                 <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseSaveAction"/>
                 <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_SaveCaseAction"/>
@@ -152,12 +146,8 @@
                 <attr name="originalFile" stringvalue="Actions/Case/org-sleuthkit-autopsy-casemodule-CaseNewAction.instance"/>
                 <attr name="position" intvalue="100"/>
             </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseOpenAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Case/org-sleuthkit-autopsy-casemodule-CaseOpenAction.instance"/>
-                <attr name="position" intvalue="101"/>
-            </file>
             <folder name="Open Recent Case">
-                <attr name="position" intvalue="103"/>
+                <attr name="position" intvalue="101"/>
                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.sleuthkit.autopsy.casemodule.Bundle"/>
                 <file name="org-sleuthkit-autopsy-casemodule-RecentCasesAction.shadow">
                     <attr name="originalFile" stringvalue="Actions/Case/org-sleuthkit-autopsy-casemodule-RecentCases.instance"/>