diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 101917fdda8..6234e008221 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1594,7 +1594,10 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			}
 		}
 
-		print '<div class="login_block">'."\n";
+		$loginBlockMoreClass = '';
+		if(!empty($conf->global->MAIN_TOP_MENU_DROPDOWN)){ $loginBlockMoreClass = 'usedropdown'; }
+		
+		print '<div class="login_block '.$loginBlockMoreClass.'">'."\n";
 
 		// Add login user link
 		$toprightmenu.='<div class="login_block_user">';
@@ -1701,8 +1704,9 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			}
 		}
 
+		
 		// Logout link
-		$toprightmenu.=@Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
+		$toprightmenu.=@Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);
 
 		$toprightmenu.='</div>';
 
diff --git a/htdocs/theme/eldy/dropdown.css.php b/htdocs/theme/eldy/dropdown.css.php
index bbca607aa21..b92fd40c597 100644
--- a/htdocs/theme/eldy/dropdown.css.php
+++ b/htdocs/theme/eldy/dropdown.css.php
@@ -42,6 +42,9 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 /*
 * MENU Dropdown 
 */
+.login_block.usedropdown .logout-btn{
+    display: none;
+}
  
 .tmenu .open.dropdown, .login_block .open.dropdown, .tmenu .open.dropdown, .login_block .dropdown:hover{
     background: rgba(0, 0, 0, 0.1);
@@ -112,7 +115,10 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 }
 
 #topmenu-login-dropdown{
-padding: 0 5px 0 5px;
+    padding: 0 5px 0 5px;
+}
+#topmenu-login-dropdown a:hover{
+    text-decoration: none;
 }
 
 #topmenuloginmoreinfo-btn{