diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 6e8cb9159de1ed54d529dd93ec117ac3486b9fa8..eb7ae306a1bbcee50bc114c2cce65c675a94915b 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -78,7 +78,7 @@ jQuery(document).ready(function () {
 	    dst = "0"; // daylight savings time is NOT observed
 	} else {
 	    dst = "1"; // daylight savings time is observed
-	}	
+	}
 	jQuery('#tz').val(std_time_offset);   				  // returns TZ
 	jQuery('#dst').val(dst);   							  // returns DST
 	// Detect and save screen resolution
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index f15a87e971190be919873ee4fea5952c4059e638..8717d25c2ed3d892354959107d512c238a584cf3 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -254,7 +254,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 			$i++;
 		}
 	}
-	$main_home=nl2br($conf->global->MAIN_HOME);
+	$main_home=dol_htmlcleanlastbr($conf->global->MAIN_HOME);
 
 	// Google AD
 	$main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);