diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 331d7e992ba..8cb1e85afe4 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -190,7 +190,7 @@ $head = ticketAdminPrepareHead();
 
 dol_fiche_head($head, 'settings', $langs->trans("Module56000Name"), -1, "ticket");
 
-print '<span class="opacitymedium">'.$langs->trans("TicketSetupDictionaries") . '</span> : <a href="' . dol_buildpath('/admin/dict.php', 1) . '" >' . dol_buildpath('/admin/dict.php', 2) . '</a><br>';
+print '<span class="opacitymedium">'.$langs->trans("TicketSetupDictionaries") . '</span> : <a href="'.DOL_URL_ROOT.'/admin/dict.php">'.$langs->trans("ClickHereToGoTo", $langs->transnoentitiesnoconv("DictionarySetup")).'</a><br>';
 
 dol_fiche_end();
 
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 05b992b3e40..a3e4d63a4bc 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -1,5 +1,6 @@
 <?php
-/*  Copyright (C) - 2013-2016	Jean-François FERRY    <hello@librethic.io>
+/* Copyright (C) - 2013-2016	Jean-François FERRY    <hello@librethic.io>
+ * Copyright (C) - 2019     	Laurent Destailleur    <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@
 /**
  *       \file       htdocs/public/ticket/index.php
  *       \ingroup    ticket
- *       \brief      Public file to add and manage ticket
+ *       \brief      Public page to add and manage ticket
  */
 
 if (!defined('NOCSRFCHECK'))   define('NOCSRFCHECK', '1');
@@ -56,21 +57,24 @@ $formticket = new FormTicket($db);
 
 $arrayofjs = array();
 $arrayofcss = array('/ticket/css/styles.css.php');
+
+if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
+{
+	print $langs->trans('TicketPublicInterfaceForbidden');
+	exit;
+}
+
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
-if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
-    print '<div class="error">' . $langs->trans('TicketPublicInterfaceForbidden') . '</div>';
-} else {
-    print '<div style="margin: 0 auto; width:60%">';
-    print '<p style="text-align: center">' . ($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")) . '</p>';
-    print '<div class="ticketform">';
-    print '<a href="create_ticket.php" class=""><div class="index_create orange bigrounded">' . dol_escape_htmltag($langs->trans("CreateTicket")) . '</div></a>';
-    print '<a href="list.php" class=""><div class="index_display blue bigrounded">' . dol_escape_htmltag($langs->trans("ShowListTicketWithTrackId")) . '</div></a>';
-    print '<a href="view.php" class=""><div class="index_display blue bigrounded">' . dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")) . '</div></a>';
-    print '<div style="clear:both;"></div>';
-    print '</div>';
-    print '</div>';
-}
+print '<div style="margin: 0 auto; width:60%">';
+print '<p style="text-align: center">' . ($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")) . '</p>';
+print '<div class="ticketform">';
+print '<a href="create_ticket.php" class=""><div class="index_create orange bigrounded">' . dol_escape_htmltag($langs->trans("CreateTicket")) . '</div></a>';
+print '<a href="list.php" class=""><div class="index_display blue bigrounded">' . dol_escape_htmltag($langs->trans("ShowListTicketWithTrackId")) . '</div></a>';
+print '<a href="view.php" class=""><div class="index_display blue bigrounded">' . dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")) . '</div></a>';
+print '<div style="clear:both;"></div>';
+print '</div>';
+print '</div>';
 
 // End of page
 htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);