diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index b32fcf3658a..990368d8738 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -29,21 +29,22 @@ print '<!-- BEGIN PHP TEMPLATE ONLINEPAYMENTLINKS -->';
 // Url list
 print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><br>';
 print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount", $servicename).':<br>';
-print '<strong>'.getOnlinePaymentUrl(1, 'free')."</strong><br><br>\n";
+print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'free')."</strong><br><br>\n";
 if (! empty($conf->commande->enabled))
 {
-	print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1, 'order')."</strong><br>\n";
+    print '<div id="order"></div>';
+    print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';
+	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'order')."</strong><br>\n";
 	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
 	    $langs->load("orders");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print '<form action="'.$_SERVER["PHP_SELF"].'#order" method="POST">';
 	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Order")).': ';
         print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';
         print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_order_ref', 'alpha'))
         {
-            print '<br> -> <strong>';
+            print '<br> -> <strong class="wordbreak">';
             $url=getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));
             print $url;
             print "</strong><br>\n";
@@ -54,18 +55,19 @@ if (! empty($conf->commande->enabled))
 }
 if (! empty($conf->facture->enabled))
 {
-	print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1, 'invoice')."</strong><br>\n";
+    print '<div id="invoice"></div>';
+    print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';
+	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'invoice')."</strong><br>\n";
 	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
 	    $langs->load("bills");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print '<form action="'.$_SERVER["PHP_SELF"].'#invoice" method="POST">';
 	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Invoice")).': ';
         print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';
         print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_invoice_ref', 'alpha'))
         {
-            print '<br> -> <strong>';
+            print '<br> -> <strong class="wordbreak">';
             $url=getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));
             print $url;
             print "</strong><br>\n";
@@ -76,18 +78,19 @@ if (! empty($conf->facture->enabled))
 }
 if (! empty($conf->contrat->enabled))
 {
-	print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1, 'contractline')."</strong><br>\n";
+    print '<div id="contractline"></div>';
+    print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';
+	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'contractline')."</strong><br>\n";
 	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
 	    $langs->load("contracts");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print '<form action="'.$_SERVER["PHP_SELF"].'#contractline" method="POST">';
 	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("ContractLine")).': ';
         print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';
         print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_contract_ref'))
         {
-            print '<br> -> <strong>';
+            print '<br> -> <strong class="wordbreak">';
             $url=getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));
             print $url;
             print "</strong><br>\n";
@@ -98,18 +101,19 @@ if (! empty($conf->contrat->enabled))
 }
 if (! empty($conf->adherent->enabled))
 {
-	print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1, 'membersubscription')."</strong><br>\n";
+    print '<div id="membersubscription"></div>';
+    print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';
+	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'membersubscription')."</strong><br>\n";
 	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
 	    $langs->load("members");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print '<form action="'.$_SERVER["PHP_SELF"].'#membersubscription" method="POST">';
 	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Member")).': ';
         print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';
         print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_member_ref'))
         {
-            print '<br> -> <strong>';
+            print '<br> -> <strong class="wordbreak">';
             $url=getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));
             print $url;
             print "</strong><br>\n";
@@ -120,18 +124,19 @@ if (! empty($conf->adherent->enabled))
 }
 if (! empty($conf->don->enabled))
 {
+    print '<div id="donation"></div>';
 	print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1, 'donation')."</strong><br>\n";
+	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'donation')."</strong><br>\n";
 	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
 	    $langs->load("members");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print '<form action="'.$_SERVER["PHP_SELF"].'#donation" method="POST">';
 	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Don")).': ';
         print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';
         print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_donation_ref'))
         {
-            print '<br> -> <strong>';
+            print '<br> -> <strong class="wordbreak">';
             $url=getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));
             print $url;
             print "</strong><br>\n";
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 46de5f4485b..64ce7b15aff 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -62,4 +62,6 @@ CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
 StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
-StripePayoutList=List of Stripe payouts
\ No newline at end of file
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
\ No newline at end of file
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 5e2c27dd392..39a9c1a249d 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -187,11 +187,11 @@ if (empty($conf->stripeconnect->enabled))
 
 	print '<tr class="oddeven"><td>';
 	print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
-	print '<input class="minwidth500" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
+	print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
 	print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
-	$out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForTestWebhook").'<br>';
+	$out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForTestWebhook").' ';
   $url = dol_buildpath('/public/stripe/ipn.php?test', 2);
-	$out.= '<input type="text" id="onlinetestwebhookurl" class="quatrevingtpercent" value="'.$url.'">';
+	$out.= '<input type="text" id="onlinetestwebhookurl" class="minwidth500" value="'.$url.'">';
 	$out.= ajax_autoselect("onlinetestwebhookurl", 0);
 	print '<br>'.$out;
 	print '</td></tr>';
@@ -222,11 +222,11 @@ if (empty($conf->stripeconnect->enabled))
 
 	print '<tr class="oddeven"><td>';
 	print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
-	print '<input class="minwidth500" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
+	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
 	print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
-  $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForLiveWebhook").'<br>';
-  $url = dol_buildpath('/public/stripe/ipn.php', 2);
-	$out.= '<input type="text" id="onlinelivewebhookurl" class="quatrevingtpercent" value="'.$url.'">';
+    $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForLiveWebhook").' ';
+    $url = dol_buildpath('/public/stripe/ipn.php', 2);
+	$out.= '<input type="text" id="onlinelivewebhookurl" class="minwidth500" value="'.$url.'">';
 	$out.= ajax_autoselect("onlinelivewebhookurl", 0);
 	print '<br>'.$out;
 	print '</td></tr>';