diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index a3ec95b4cff..7b9a69256d9 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -374,7 +374,7 @@ if ($mode != 4)
                             		}
                             		else
                             		{
-                            			print '<a href="'.DOL_URL_ROOT.'/custom/modules/'.$regs[2].'/admin/'.$regs[1].'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a>&nbsp;';
+                            			print '<a href="'.DOL_URL_EXTMODULE.'/'.$regs[2].'/admin/'.$regs[1].'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a>&nbsp;';
                             		}
                             	}
                             	else
@@ -393,7 +393,7 @@ if ($mode != 4)
                         }
                         else
                         {
-                        	print '<td align="right" valign="top"><a href="'.DOL_URL_ROOT.'/custom/modules/'.$regs[2].'/admin/'.$regs[1].'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a></td>';
+                        	print '<td align="right" valign="top"><a href="'.DOL_URL_EXTMODULE.'/'.$regs[2].'/admin/'.$regs[1].'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a></td>';
                         }
                     }
                     else
diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php
index 4a3eb12eaed..37a2f930ff5 100644
--- a/htdocs/includes/menus/standard/eldy.lib.php
+++ b/htdocs/includes/menus/standard/eldy.lib.php
@@ -453,7 +453,8 @@ function print_eldy_menu($db,$atarget,$type_user)
 				}
 				else
 				{
-					$url=DOL_URL_ROOT.$tabMenu[$i]['url'];
+					if (file_exists(DOL_DOCUMENT_ROOT.$tabMenu[$i]['url'])) $url=DOL_URL_ROOT.$tabMenu[$i]['url'];
+					else $url=DOL_URL_EXTMODULE.$tabMenu[$i]['url'];
 					if (! preg_match('/\?/',$url)) $url.='?';
 					else $url.='&';
 					if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url))