diff --git a/htdocs/core/templates/login.tpl b/htdocs/core/templates/login.tpl
index 2b275325484..b719cc3cc8c 100644
--- a/htdocs/core/templates/login.tpl
+++ b/htdocs/core/templates/login.tpl
@@ -21,9 +21,8 @@
header("Content-type: text/html; charset=".$conf->file->character_set_client);
{/php}
-
-
+
@@ -124,6 +123,10 @@ function donnefocus() {ldelim}
{if $forgetpasslink}
(
{$langs->trans('PasswordForgotten')}
+ {if ! $helpcenterlink}
+ )
+ {/if}
+
{/if}
{if $helpcenterlink}
@@ -133,9 +136,8 @@ function donnefocus() {ldelim}
{else}
(
{/if}
- {$langs->trans('NeedHelpCenter')}
+ {$langs->trans('NeedHelpCenter')})
{/if}
- )
{/strip}
{/if}
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 1c14d2aef1d..2b7ffddcff6 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -248,10 +248,13 @@ function dol_loginfunction($langs,$conf,$mysoc)
if (! empty($conf->browser->phone)) print '| |
'; // More space with phones
print '| ';
+
if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
{
print '(';
print $langs->trans("PasswordForgotten");
+ if (! empty($conf->global->MAIN_HELPCENTER_DISABLELINK)) print ')';
+ print '';
}
if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
@@ -261,8 +264,9 @@ function dol_loginfunction($langs,$conf,$mysoc)
if (! empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK)) print '(';
else print ' - ';
print $langs->trans("NeedHelpCenter");
+ print ')';
}
- print ')';
+
print ' |
';
}