diff --git a/x-pack/plugins/security/public/nav_control/nav_control_component.scss b/x-pack/plugins/security/public/nav_control/nav_control_component.scss
index 9ec5cd2d3689d..a3e04b08cfac2 100644
--- a/x-pack/plugins/security/public/nav_control/nav_control_component.scss
+++ b/x-pack/plugins/security/public/nav_control/nav_control_component.scss
@@ -1,5 +1,11 @@
-.securityNavControlComponent__userMenu {
+.chrNavControl__userMenu {
   .euiContextMenuPanelTitle {
+    // Uppercased by default, override to match actual username
     text-transform: none;
   }
+
+  .euiContextMenuItem {
+    // Temp fix for EUI issue https://github.com/elastic/eui/issues/3092
+    line-height: normal;
+  }
 }
\ No newline at end of file
diff --git a/x-pack/plugins/security/public/nav_control/nav_control_component.tsx b/x-pack/plugins/security/public/nav_control/nav_control_component.tsx
index 2f8bb5c1b2aae..aed4bfa8c2c5b 100644
--- a/x-pack/plugins/security/public/nav_control/nav_control_component.tsx
+++ b/x-pack/plugins/security/public/nav_control/nav_control_component.tsx
@@ -137,7 +137,6 @@ export class SecurityNavControl extends Component<Props, State> {
           defaultMessage="Log out"
         />
       ),
-      className: 'securityNavControlComponent__logoutLink',
       icon: <EuiIcon type="exit" size="m" />,
       href: logoutUrl,
       'data-test-subj': 'logoutLink',
@@ -185,11 +184,7 @@ export class SecurityNavControl extends Component<Props, State> {
         panelPaddingSize="none"
       >
         <div data-test-subj="userMenu">
-          <EuiContextMenu
-            className="securityNavControlComponent__userMenu"
-            initialPanelId={0}
-            panels={panels}
-          />
+          <EuiContextMenu className="chrNavControl__userMenu" initialPanelId={0} panels={panels} />
         </div>
       </EuiPopover>
     );