diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 7c8de60082e..7f78caa2b3e 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -178,9 +178,9 @@ if ($action == 'confirm_delete') {
 			$callbacktodel .= '/core/modules/oauth/google_oauthcallback.php?action=delete&keyforprovider='.$provider.'&token='.newToken().'&backtourl='.urlencode($backtourl);
 		} elseif ($label == 'OAUTH_GITHUB') {
 			$callbacktodel .= '/core/modules/oauth/github_oauthcallback.php?action=delete&keyforprovider='.$provider.'&token='.newToken().'&backtourl='.urlencode($backtourl);
-		} elseif ($label == 'OAUTH_STRIPE_LIVE') {
+		} elseif ($label == 'OAUTH_STRIPELIVE') {
 			$callbacktodel .= '/core/modules/oauth/stripelive_oauthcallback.php?action=delete&keyforprovider='.$provider.'&token='.newToken().'&backtourl='.urlencode($backtourl);
-		} elseif ($label == 'OAUTH_STRIPE_TEST') {
+		} elseif ($label == 'OAUTH_STRIPETEST') {
 			$callbacktodel .= '/core/modules/oauth/stripetest_oauthcallback.php?action=delete&keyforprovider='.$provider.'&token='.newToken().'&backtourl='.urlencode($backtourl);
 		} elseif ($label == 'OAUTH_MICROSOFT') {
 			$callbacktodel .= '/core/modules/oauth/microsoft_oauthcallback.php?action=delete&keyforprovider='.$provider.'&token='.newToken().'&backtourl='.urlencode($backtourl);
@@ -249,9 +249,11 @@ print dol_get_fiche_head($head, 'services', '', -1, '');
 print '<span class="opacitymedium">'.$langs->trans("ListOfSupportedOauthProviders").'</span><br><br>';
 
 
+$list = getAllOauth2Array();
+
+
 print '<select name="provider" id="provider" class="minwidth150">';
 print '<option name="-1" value="-1">'.$langs->trans("OAuthProvider").'</option>';
-$list = getAllOauth2Array();
 // TODO Make a loop directly on getSupportedOauth2Array() and remove getAllOauth2Array()
 foreach ($list as $key) {
 	$supported = 0;
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 33b5d985d00..582bac73f86 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -257,8 +257,9 @@ if ($mode == 'setup' && $user->admin) {
 			$keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array);
 			$keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME';
 
-
-			$OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : ''));
+			$nameofservice = ucfirst(strtolower(empty($supportedoauth2array[$keyforsupportedoauth2array]['callbackfile']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['callbackfile']));
+			$nameofservice .= ($keyforprovider ? '-'.$keyforprovider : '');
+			$OAUTH_SERVICENAME = $nameofservice;
 
 			$shortscope = '';
 			if (getDolGlobalString($key[4])) {
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 68d2b98cdf5..0658c6df412 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -22,7 +22,7 @@
 
 /**
  *  \file           htdocs/admin/system/dbtable.php
- *  \brief          Page d'info des contraintes d'une table
+ *  \brief          Page with information about a database table
  */
 
 // Load Dolibarr environment
@@ -155,6 +155,7 @@ if (!$base || $sql === null) {
 			}
 		}
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Fields").'</td>';
@@ -233,13 +234,14 @@ if (!$base || $sql === null) {
 				print "<td>".(isset($link[$row[0]][0]) ? $link[$row[0]][0] : '').".";
 				print(isset($link[$row[0]][1]) ? $link[$row[0]][1] : '')."</td>";
 
-				print '<!-- ALTER TABLE '.$table.' MODIFY '.$row[0].' '.$row[1].' COLLATE utf8_unicode_ci; -->';
-				print '<!-- ALTER TABLE '.$table.' MODIFY '.$row[0].' '.$row[1].' CHARACTER SET utf8; -->';
+				print '<!-- ALTER TABLE '.$table.' MODIFY '.$row[0].' '.$row[1].' COLLATE utf8mb4_unicode_ci; -->';
+				print '<!-- ALTER TABLE '.$table.' MODIFY '.$row[0].' '.$row[1].' CHARACTER SET utf8mb4; -->';
 				print '</tr>';
 				$i++;
 			}
 		}
 		print '</table>';
+		print '</div>';
 	}
 }
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 89c9e6f1f2c..ccf8895635c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13514,7 +13514,7 @@ function forgeSQLFromUniversalSearchCriteria($filter, &$errorstr = '', $noand =
 {
 	global $db, $user;
 
-	if (is_null($filter) || is_array($filter) || $filter === '') {
+	if (is_null($filter) || !is_string($filter) || $filter === '') {
 		return '';
 	}
 	if (!preg_match('/^\(.*\)$/', $filter)) {    // If $filter does not start and end with ()
diff --git a/htdocs/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php
index 2366b4c0d34..66a1244c860 100644
--- a/htdocs/core/lib/oauth.lib.php
+++ b/htdocs/core/lib/oauth.lib.php
@@ -33,238 +33,238 @@
 function getAllOauth2Array()
 {
 	$list = array(
-	array(
-		'OAUTH_AMAZON_NAME',
-		'OAUTH_AMAZON_ID',
-		'OAUTH_AMAZON_SECRET',
-	),
-	array(
-		'OAUTH_BITBUCKET_NAME',
-		'OAUTH_BITBUCKET_ID',
-		'OAUTH_BITBUCKET_SECRET',
-	),
-	array(
-		'OAUTH_BITLY_NAME',
-		'OAUTH_BITLY_ID',
-		'OAUTH_BITLY_SECRET',
-	),
-	array(
-		'OAUTH_BITRIX24_NAME',
-		'OAUTH_BITRIX24_ID',
-		'OAUTH_BITRIX24_SECRET',
-	),
-	array(
-		'OAUTH_BOX_NAME',
-		'OAUTH_BOX_ID',
-		'OAUTH_BOX_SECRET',
-	),
-	array(
-		'OAUTH_BUFFER_NAME',
-		'OAUTH_BUFFER_ID',
-		'OAUTH_BUFFER_SECRET',
-	),
-	array(
-		'OAUTH_DAILYMOTION_NAME',
-		'OAUTH_DAILYMOTION_ID',
-		'OAUTH_DAILYMOTION_SECRET',
-	),
-	array(
-		'OAUTH_DEVIANTART_NAME',
-		'OAUTH_DEVIANTART_ID',
-		'OAUTH_DEVIANTART_SECRET',
-	),
-	array(
-		'OAUTH_DROPBOX_NAME',
-		'OAUTH_DROPBOX_ID',
-		'OAUTH_DROPBOX_SECRET',
-	),
-	array(
-		'OAUTH_ETSY_NAME',
-		'OAUTH_ETSY_ID',
-		'OAUTH_ETSY_SECRET',
-	),
-	array(
-		'OAUTH_EVEONLINE_NAME',
-		'OAUTH_EVEONLINE_ID',
-		'OAUTH_EVEONLINE_SECRET',
-	),
-	array(
-		'OAUTH_FACEBOOK_NAME',
-		'OAUTH_FACEBOOK_ID',
-		'OAUTH_FACEBOOK_SECRET',
-	),
-	array(
-		'OAUTH_FITBIT_NAME',
-		'OAUTH_FITBIT_ID',
-		'OAUTH_FITBIT_SECRET',
-	),
-	array(
-		'OAUTH_FIVEHUNDREDPX_NAME',
-		'OAUTH_FIVEHUNDREDPX_ID',
-		'OAUTH_FIVEHUNDREDPX_SECRET',
-	),
-	array(
-		'OAUTH_FLICKR_NAME',
-		'OAUTH_FLICKR_ID',
-		'OAUTH_FLICKR_SECRET',
-	),
-	array(
-		'OAUTH_FOURSQUARE_NAME',
-		'OAUTH_FOURSQUARE_ID',
-		'OAUTH_FOURSQUARE_SECRET',
-	),
-	array(
-		'OAUTH_GITHUB_NAME',
-		'OAUTH_GITHUB_ID',
-		'OAUTH_GITHUB_SECRET',
-		'OAUTH_GITHUB_DESC',
-	),
-	array(
-		'OAUTH_GOOGLE_NAME',
-		'OAUTH_GOOGLE_ID',
-		'OAUTH_GOOGLE_SECRET',
-		'OAUTH_GOOGLE_DESC',
-	),
-	array(
-		'OAUTH_HUBIC_NAME',
-		'OAUTH_HUBIC_ID',
-		'OAUTH_HUBIC_SECRET',
-	),
-	array(
-		'OAUTH_INSTAGRAM_NAME',
-		'OAUTH_INSTAGRAM_ID',
-		'OAUTH_INSTAGRAM_SECRET',
-	),
-	array(
-		'OAUTH_LINKEDIN_NAME',
-		'OAUTH_LINKEDIN_ID',
-		'OAUTH_LINKEDIN_SECRET',
-	),
-	array(
-		'OAUTH_MAILCHIMP_NAME',
-		'OAUTH_MAILCHIMP_ID',
-		'OAUTH_MAILCHIMP_SECRET',
-	),
-	array(
-		'OAUTH_MICROSOFT_NAME',
-		'OAUTH_MICROSOFT_ID',
-		'OAUTH_MICROSOFT_SECRET',
-	),
-	array(
-		'OAUTH_MICROSOFT2_NAME',
-		'OAUTH_MICROSOFT2_ID',
-		'OAUTH_MICROSOFT2_SECRET',
-	),
-	array(
-		'OAUTH_NEST_NAME',
-		'OAUTH_NEST_ID',
-		'OAUTH_NEST_SECRET',
-	),
-	array(
-		'OAUTH_NETATMO_NAME',
-		'OAUTH_NETATMO_ID',
-		'OAUTH_NETATMO_SECRET',
-	),
-	array(
-		'OAUTH_PARROTFLOWERPOWER_NAME',
-		'OAUTH_PARROTFLOWERPOWER_ID',
-		'OAUTH_PARROTFLOWERPOWER_SECRET',
-	),
-	array(
-		'OAUTH_PAYPAL_NAME',
-		'OAUTH_PAYPAL_ID',
-		'OAUTH_PAYPAL_SECRET',
-	),
-	array(
-		'OAUTH_POCKET_NAME',
-		'OAUTH_POCKET_ID',
-		'OAUTH_POCKET_SECRET',
-	),
-	array(
-		'OAUTH_QUICKBOOKS_NAME',
-		'OAUTH_QUICKBOOKS_ID',
-		'OAUTH_QUICKBOOKS_SECRET',
-	),
-	array(
-		'OAUTH_REDDIT_NAME',
-		'OAUTH_REDDIT_ID',
-		'OAUTH_REDDIT_SECRET',
-	),
-	array(
-		'OAUTH_REDMINE_NAME',
-		'OAUTH_REDMINE_ID',
-		'OAUTH_REDMINE_SECRET',
-	),
-	array(
-		'OAUTH_RUNKEEPER_NAME',
-		'OAUTH_RUNKEEPER_ID',
-		'OAUTH_RUNKEEPER_SECRET',
-	),
-	array(
-		'OAUTH_SCOOPIT_NAME',
-		'OAUTH_SCOOPIT_ID',
-		'OAUTH_SCOOPIT_SECRET',
-	),
-	array(
-		'OAUTH_SOUNDCLOUD_NAME',
-		'OAUTH_SOUNDCLOUD_ID',
-		'OAUTH_SOUNDCLOUD_SECRET',
-	),
-	array(
-		'OAUTH_SPOTIFY_NAME',
-		'OAUTH_SPOTIFY_ID',
-		'OAUTH_SPOTIFY_SECRET',
-	),
-	array(
-		'OAUTH_STRAVA_NAME',
-		'OAUTH_STRAVA_ID',
-		'OAUTH_STRAVA_SECRET',
-	),
-	array(
-		'OAUTH_STRIPE_TEST_NAME',
-		'OAUTH_STRIPE_TEST_ID',
-		'STRIPE_TEST_SECRET_KEY',
-	),
-	array(
-		'OAUTH_STRIPE_LIVE_NAME',
-		'OAUTH_STRIPE_LIVE_ID',
-		'STRIPE_LIVE_SECRET_KEY',
-	),
-	array(
-		'OAUTH_TUMBLR_NAME',
-		'OAUTH_TUMBLR_ID',
-		'OAUTH_TUMBLR_SECRET',
-	),
-	array(
-		'OAUTH_TWITTER_NAME',
-		'OAUTH_TWITTER_ID',
-		'OAUTH_TWITTER_SECRET',
-	),
-	array(
-		'OAUTH_USTREAM_NAME',
-		'OAUTH_USTREAM_ID',
-		'OAUTH_USTREAM_SECRET',
-	),
-	array(
-		'OAUTH_VIMEO_NAME',
-		'OAUTH_VIMEO_ID',
-		'OAUTH_VIMEO_SECRET',
-	),
-	array(
-		'OAUTH_YAHOO_NAME',
-		'OAUTH_YAHOO_ID',
-		'OAUTH_YAHOO_SECRET',
-	),
-	array(
-		'OAUTH_YAMMER_NAME',
-		'OAUTH_YAMMER_ID',
-		'OAUTH_YAMMER_SECRET',
-	),
-	array(
-		'OAUTH_GENERIC_NAME',
-		'OAUTH_GENERIC_ID',
-		'OAUTH_GENERIC_SECRET',
-	)
+		array(
+			'OAUTH_AMAZON_NAME',
+			'OAUTH_AMAZON_ID',
+			'OAUTH_AMAZON_SECRET',
+		),
+		array(
+			'OAUTH_BITBUCKET_NAME',
+			'OAUTH_BITBUCKET_ID',
+			'OAUTH_BITBUCKET_SECRET',
+		),
+		array(
+			'OAUTH_BITLY_NAME',
+			'OAUTH_BITLY_ID',
+			'OAUTH_BITLY_SECRET',
+		),
+		array(
+			'OAUTH_BITRIX24_NAME',
+			'OAUTH_BITRIX24_ID',
+			'OAUTH_BITRIX24_SECRET',
+		),
+		array(
+			'OAUTH_BOX_NAME',
+			'OAUTH_BOX_ID',
+			'OAUTH_BOX_SECRET',
+		),
+		array(
+			'OAUTH_BUFFER_NAME',
+			'OAUTH_BUFFER_ID',
+			'OAUTH_BUFFER_SECRET',
+		),
+		array(
+			'OAUTH_DAILYMOTION_NAME',
+			'OAUTH_DAILYMOTION_ID',
+			'OAUTH_DAILYMOTION_SECRET',
+		),
+		array(
+			'OAUTH_DEVIANTART_NAME',
+			'OAUTH_DEVIANTART_ID',
+			'OAUTH_DEVIANTART_SECRET',
+		),
+		array(
+			'OAUTH_DROPBOX_NAME',
+			'OAUTH_DROPBOX_ID',
+			'OAUTH_DROPBOX_SECRET',
+		),
+		array(
+			'OAUTH_ETSY_NAME',
+			'OAUTH_ETSY_ID',
+			'OAUTH_ETSY_SECRET',
+		),
+		array(
+			'OAUTH_EVEONLINE_NAME',
+			'OAUTH_EVEONLINE_ID',
+			'OAUTH_EVEONLINE_SECRET',
+		),
+		array(
+			'OAUTH_FACEBOOK_NAME',
+			'OAUTH_FACEBOOK_ID',
+			'OAUTH_FACEBOOK_SECRET',
+		),
+		array(
+			'OAUTH_FITBIT_NAME',
+			'OAUTH_FITBIT_ID',
+			'OAUTH_FITBIT_SECRET',
+		),
+		array(
+			'OAUTH_FIVEHUNDREDPX_NAME',
+			'OAUTH_FIVEHUNDREDPX_ID',
+			'OAUTH_FIVEHUNDREDPX_SECRET',
+		),
+		array(
+			'OAUTH_FLICKR_NAME',
+			'OAUTH_FLICKR_ID',
+			'OAUTH_FLICKR_SECRET',
+		),
+		array(
+			'OAUTH_FOURSQUARE_NAME',
+			'OAUTH_FOURSQUARE_ID',
+			'OAUTH_FOURSQUARE_SECRET',
+		),
+		array(
+			'OAUTH_GITHUB_NAME',
+			'OAUTH_GITHUB_ID',
+			'OAUTH_GITHUB_SECRET',
+			'OAUTH_GITHUB_DESC',
+		),
+		array(
+			'OAUTH_GOOGLE_NAME',
+			'OAUTH_GOOGLE_ID',
+			'OAUTH_GOOGLE_SECRET',
+			'OAUTH_GOOGLE_DESC',
+		),
+		array(
+			'OAUTH_HUBIC_NAME',
+			'OAUTH_HUBIC_ID',
+			'OAUTH_HUBIC_SECRET',
+		),
+		array(
+			'OAUTH_INSTAGRAM_NAME',
+			'OAUTH_INSTAGRAM_ID',
+			'OAUTH_INSTAGRAM_SECRET',
+		),
+		array(
+			'OAUTH_LINKEDIN_NAME',
+			'OAUTH_LINKEDIN_ID',
+			'OAUTH_LINKEDIN_SECRET',
+		),
+		array(
+			'OAUTH_MAILCHIMP_NAME',
+			'OAUTH_MAILCHIMP_ID',
+			'OAUTH_MAILCHIMP_SECRET',
+		),
+		array(
+			'OAUTH_MICROSOFT_NAME',
+			'OAUTH_MICROSOFT_ID',
+			'OAUTH_MICROSOFT_SECRET',
+		),
+		array(
+			'OAUTH_MICROSOFT2_NAME',
+			'OAUTH_MICROSOFT2_ID',
+			'OAUTH_MICROSOFT2_SECRET',
+		),
+		array(
+			'OAUTH_NEST_NAME',
+			'OAUTH_NEST_ID',
+			'OAUTH_NEST_SECRET',
+		),
+		array(
+			'OAUTH_NETATMO_NAME',
+			'OAUTH_NETATMO_ID',
+			'OAUTH_NETATMO_SECRET',
+		),
+		array(
+			'OAUTH_PARROTFLOWERPOWER_NAME',
+			'OAUTH_PARROTFLOWERPOWER_ID',
+			'OAUTH_PARROTFLOWERPOWER_SECRET',
+		),
+		array(
+			'OAUTH_PAYPAL_NAME',
+			'OAUTH_PAYPAL_ID',
+			'OAUTH_PAYPAL_SECRET',
+		),
+		array(
+			'OAUTH_POCKET_NAME',
+			'OAUTH_POCKET_ID',
+			'OAUTH_POCKET_SECRET',
+		),
+		array(
+			'OAUTH_QUICKBOOKS_NAME',
+			'OAUTH_QUICKBOOKS_ID',
+			'OAUTH_QUICKBOOKS_SECRET',
+		),
+		array(
+			'OAUTH_REDDIT_NAME',
+			'OAUTH_REDDIT_ID',
+			'OAUTH_REDDIT_SECRET',
+		),
+		array(
+			'OAUTH_REDMINE_NAME',
+			'OAUTH_REDMINE_ID',
+			'OAUTH_REDMINE_SECRET',
+		),
+		array(
+			'OAUTH_RUNKEEPER_NAME',
+			'OAUTH_RUNKEEPER_ID',
+			'OAUTH_RUNKEEPER_SECRET',
+		),
+		array(
+			'OAUTH_SCOOPIT_NAME',
+			'OAUTH_SCOOPIT_ID',
+			'OAUTH_SCOOPIT_SECRET',
+		),
+		array(
+			'OAUTH_SOUNDCLOUD_NAME',
+			'OAUTH_SOUNDCLOUD_ID',
+			'OAUTH_SOUNDCLOUD_SECRET',
+		),
+		array(
+			'OAUTH_SPOTIFY_NAME',
+			'OAUTH_SPOTIFY_ID',
+			'OAUTH_SPOTIFY_SECRET',
+		),
+		array(
+			'OAUTH_STRAVA_NAME',
+			'OAUTH_STRAVA_ID',
+			'OAUTH_STRAVA_SECRET',
+		),
+		array(
+			'OAUTH_STRIPETEST_NAME',
+			'OAUTH_STRIPETEST_ID',
+			'OAUTH_STRIPETEST_SECRET_KEY',
+		),
+		array(
+			'OAUTH_STRIPELIVE_NAME',
+			'OAUTH_STRIPELIVE_ID',
+			'OAUTH_STRIPELIVE_SECRET_KEY',
+		),
+		array(
+			'OAUTH_TUMBLR_NAME',
+			'OAUTH_TUMBLR_ID',
+			'OAUTH_TUMBLR_SECRET',
+		),
+		array(
+			'OAUTH_TWITTER_NAME',
+			'OAUTH_TWITTER_ID',
+			'OAUTH_TWITTER_SECRET',
+		),
+		array(
+			'OAUTH_USTREAM_NAME',
+			'OAUTH_USTREAM_ID',
+			'OAUTH_USTREAM_SECRET',
+		),
+		array(
+			'OAUTH_VIMEO_NAME',
+			'OAUTH_VIMEO_ID',
+			'OAUTH_VIMEO_SECRET',
+		),
+		array(
+			'OAUTH_YAHOO_NAME',
+			'OAUTH_YAHOO_ID',
+			'OAUTH_YAHOO_SECRET',
+		),
+		array(
+			'OAUTH_YAMMER_NAME',
+			'OAUTH_YAMMER_ID',
+			'OAUTH_YAMMER_SECRET',
+		),
+		array(
+			'OAUTH_GENERIC_NAME',
+			'OAUTH_GENERIC_ID',
+			'OAUTH_GENERIC_SECRET',
+		)
 	);
 
 	return $list;
@@ -291,7 +291,7 @@ function getSupportedOauth2Array()
 		),
 	);
 	if (isModEnabled('stripe')) {
-		$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = array(
+		$supportedoauth2array['OAUTH_STRIPETEST_NAME'] = array(
 			'callbackfile' => 'stripetest',
 			'picto' => 'stripe',
 			'urlforapp' => '',
@@ -300,7 +300,7 @@ function getSupportedOauth2Array()
 			'availablescopes' => 'read_write',
 			'returnurl' => '/core/modules/oauth/stripetest_oauthcallback.php'
 		);
-		$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = array(
+		$supportedoauth2array['OAUTH_STRIPELIVE_NAME'] = array(
 			'callbackfile' => 'stripelive',
 			'picto' => 'stripe',
 			'urlforapp' => '',
@@ -340,6 +340,7 @@ function getSupportedOauth2Array()
 		'availablescopes' => 'openid,offline_access,profile,email,User.Read,https://outlook.office.com/.default',
 		'returnurl' => '/core/modules/oauth/microsoft_oauthcallback.php'
 	);
+
 	// Add a generic Oauth token handler. Tested with Mastodon.
 	$supportedoauth2array['OAUTH_GENERIC_NAME'] = array(
 		'callbackfile' => 'generic',
diff --git a/htdocs/core/modules/oauth/generic_oauthcallback.php b/htdocs/core/modules/oauth/generic_oauthcallback.php
index c5993d99cd9..4ebdcc2518f 100644
--- a/htdocs/core/modules/oauth/generic_oauthcallback.php
+++ b/htdocs/core/modules/oauth/generic_oauthcallback.php
@@ -244,7 +244,7 @@ if (!GETPOST('code') && !GETPOST('error')) {
 	exit();
 } else {
 	// We are coming from the return of an OAuth2 provider page.
-	dol_syslog("We are coming from the oauth provider page keyforprovider=".$keyforprovider." code=".dol_trunc(GETPOST('code'), 5));
+	dol_syslog(basename(__FILE__)." We are coming from the oauth provider page keyforprovider=".$keyforprovider." code=".dol_trunc(GETPOST('code'), 5));
 
 	// We must validate that the $state is the same than the one into $_SESSION['oauthstateanticsrf'], return error if not.
 	if (isset($_SESSION['oauthstateanticsrf']) && $state != $_SESSION['oauthstateanticsrf']) {
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index fe77dcb3dd0..ae0464db61e 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -121,7 +121,7 @@ if (GETPOST('code')) {     // We are coming from oauth provider page
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
-	dol_syslog("We are coming from the oauth provider page code=".dol_trunc(GETPOST('code'), 5));
+	dol_syslog(basename(__FILE__)." We are coming from the oauth provider page code=".dol_trunc(GETPOST('code'), 5));
 
 	// This was a callback request from service, get the token
 	try {
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 381ed5e3635..a39eac8ab6c 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -222,7 +222,7 @@ if (!GETPOST('code')) {
 	exit();
 } else {
 	// We are coming from the return of an OAuth2 provider page.
-	dol_syslog("We are coming from the oauth provider page keyforprovider=".$keyforprovider." code=".dol_trunc(GETPOST('code'), 5));
+	dol_syslog(basename(__FILE__)." We are coming from the oauth provider page keyforprovider=".$keyforprovider." code=".dol_trunc(GETPOST('code'), 5));
 
 	// We must validate that the $state is the same than the one into $_SESSION['oauthstateanticsrf'], return error if not.
 	if (isset($_SESSION['oauthstateanticsrf']) && $state != $_SESSION['oauthstateanticsrf']) {
diff --git a/htdocs/core/modules/oauth/microsoft2_oauthcallback.php b/htdocs/core/modules/oauth/microsoft2_oauthcallback.php
index 10146a1be44..671be6ab3f5 100644
--- a/htdocs/core/modules/oauth/microsoft2_oauthcallback.php
+++ b/htdocs/core/modules/oauth/microsoft2_oauthcallback.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *      \file       htdocs/core/modules/oauth/microsoft_oauthcallback.php
+ *      \file       htdocs/core/modules/oauth/microsoft2_oauthcallback.php
  *      \ingroup    oauth
  *      \brief      Page to get oauth callback
  */
@@ -50,7 +50,7 @@ $genericstring = 'MICROSOFT2';
 $uriFactory = new \OAuth\Common\Http\Uri\UriFactory();
 //$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
 //$currentUri->setQuery('');
-$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/microsoft_oauthcallback.php');
+$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/microsoft2_oauthcallback.php');
 
 
 /**
@@ -95,7 +95,8 @@ if ($action != 'delete' && empty($requestedpermissionsarray)) {
 // $requestedpermissionsarray contains list of scopes.
 // Conversion into URL is done by Reflection on constant with name SCOPE_scope_in_uppercase
 try {
-	$apiService = $serviceFactory->createService(ucfirst(strtolower($genericstring)), $credentials, $storage, $requestedpermissionsarray);
+	$nameofservice = ucfirst(strtolower($genericstring));
+	$apiService = $serviceFactory->createService($nameofservice, $credentials, $storage, $requestedpermissionsarray);
 	'@phan-var-force  OAuth\OAuth2\Service\AbstractService|OAuth\OAuth1\Service\AbstractService $apiService'; // createService is only ServiceInterface
 } catch (Exception $e) {
 	print $e->getMessage();
@@ -124,6 +125,9 @@ if (!getDolGlobalString($keyforparamid)) {
 if (!getDolGlobalString($keyforparamsecret)) {
 	accessforbidden('Setup of service is not complete. Secret key is missing');
 }
+if (!getDolGlobalString($keyforparamtenant)) {
+	accessforbidden('Setup of service is not complete. Tenant/Annuary ID key is missing');
+}
 
 
 /*
@@ -151,7 +155,7 @@ if (GETPOST('code') || GETPOST('error')) {     // We are coming from oauth provi
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
-	dol_syslog("We are coming from the oauth provider page code=".dol_trunc(GETPOST('code'), 5)." error=".GETPOST('error'));
+	dol_syslog(basename(__FILE__)." We are coming from the oauth provider page code=".dol_trunc(GETPOST('code'), 5)." error=".GETPOST('error'));
 
 	// This was a callback request from service, get the token
 	try {
diff --git a/htdocs/core/modules/oauth/microsoft_oauthcallback.php b/htdocs/core/modules/oauth/microsoft_oauthcallback.php
index 6d32b4047c9..de0d5c3ea42 100644
--- a/htdocs/core/modules/oauth/microsoft_oauthcallback.php
+++ b/htdocs/core/modules/oauth/microsoft_oauthcallback.php
@@ -43,7 +43,6 @@ if (empty($keyforprovider) && !empty($_SESSION["oauthkeyforproviderbeforeoauthju
 }
 $genericstring = 'MICROSOFT';
 
-
 /**
  * Create a new instance of the URI class with the current URI, stripping the query string
  */
@@ -95,7 +94,8 @@ if ($action != 'delete' && empty($requestedpermissionsarray)) {
 // $requestedpermissionsarray contains list of scopes.
 // Conversion into URL is done by Reflection on constant with name SCOPE_scope_in_uppercase
 try {
-	$apiService = $serviceFactory->createService(ucfirst(strtolower($genericstring)), $credentials, $storage, $requestedpermissionsarray);
+	$nameofservice = ucfirst(strtolower($genericstring));
+	$apiService = $serviceFactory->createService($nameofservice, $credentials, $storage, $requestedpermissionsarray);
 	'@phan-var-force  OAuth\OAuth2\Service\AbstractService|OAuth\OAuth1\Service\AbstractService $apiService'; // createService is only ServiceInterface
 } catch (Exception $e) {
 	print $e->getMessage();
@@ -124,6 +124,9 @@ if (!getDolGlobalString($keyforparamid)) {
 if (!getDolGlobalString($keyforparamsecret)) {
 	accessforbidden('Setup of service is not complete. Secret key is missing');
 }
+if (!getDolGlobalString($keyforparamtenant)) {
+	accessforbidden('Setup of service is not complete. Tenant/Annuary ID key is missing');
+}
 
 
 /*
@@ -151,7 +154,7 @@ if (GETPOST('code') || GETPOST('error')) {     // We are coming from oauth provi
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
-	dol_syslog("We are coming from the oauth provider page code=".dol_trunc(GETPOST('code'), 5)." error=".GETPOST('error'));
+	dol_syslog(basename(__FILE__)." We are coming from the oauth provider page code=".dol_trunc(GETPOST('code'), 5)." error=".GETPOST('error'));
 
 	// This was a callback request from service, get the token
 	try {
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index 3c3070a6abc..e3da7ee447c 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -68,8 +68,8 @@ $serviceFactory->setHttpClient($httpClient);
 $storage = new DoliStorage($db, $conf, $keyforprovider);
 
 // Setup the credentials for the requests
-$keyforparamid = 'OAUTH_STRIPE_LIVE'.($keyforprovider ? '-'.$keyforprovider : '').'_ID';
-$keyforparamsecret = 'OAUTH_STRIPE_LIVE'.($keyforprovider ? '-'.$keyforprovider : '').'_SECRET';
+$keyforparamid = 'OAUTH_STRIPELIVE'.($keyforprovider ? '-'.$keyforprovider : '').'_ID';
+$keyforparamsecret = 'OAUTH_STRIPELIVE'.($keyforprovider ? '-'.$keyforprovider : '').'_SECRET';
 $credentials = new Credentials(
 	getDolGlobalString($keyforparamid),
 	getDolGlobalString($keyforparamsecret),
@@ -131,7 +131,7 @@ if (GETPOST('code')) {     // We are coming from oauth provider page
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
-	dol_syslog("We are coming from the oauth provider page code=".dol_trunc(GETPOST('code'), 5));
+	dol_syslog(basename(__FILE__)." We are coming from the oauth provider page code=".dol_trunc(GETPOST('code'), 5));
 
 	// This was a callback request from service, get the token
 	if ($apiService === null) {
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index 78b8007d986..753ccd10c40 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -67,8 +67,8 @@ $serviceFactory->setHttpClient($httpClient);
 $storage = new DoliStorage($db, $conf, $keyforprovider);
 
 // Setup the credentials for the requests
-$keyforparamid = 'OAUTH_STRIPE_TEST'.($keyforprovider ? '-'.$keyforprovider : '').'_ID';
-$keyforparamsecret = 'OAUTH_STRIPE_TEST'.($keyforprovider ? '-'.$keyforprovider : '').'_SECRET';
+$keyforparamid = 'OAUTH_STRIPETEST'.($keyforprovider ? '-'.$keyforprovider : '').'_ID';
+$keyforparamsecret = 'OAUTH_STRIPETEST'.($keyforprovider ? '-'.$keyforprovider : '').'_SECRET';
 $credentials = new Credentials(
 	getDolGlobalString($keyforparamid),
 	getDolGlobalString($keyforparamsecret),
@@ -124,7 +124,7 @@ if (GETPOST('code')) {     // We are coming from oauth provider page
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
-	dol_syslog("We are coming from the oauth provider page code=".dol_trunc(GETPOST('code'), 5));
+	dol_syslog(basename(__FILE__)." We are coming from the oauth provider page code=".dol_trunc(GETPOST('code'), 5));
 
 	// This was a callback request from service, get the token
 	try {
diff --git a/htdocs/langs/en_US/recruitment.lang b/htdocs/langs/en_US/recruitment.lang
index 04919e2a1b2..047455d5e2b 100644
--- a/htdocs/langs/en_US/recruitment.lang
+++ b/htdocs/langs/en_US/recruitment.lang
@@ -64,3 +64,4 @@ NoPositionOpen=No positions open at the moment
 ConfirmClose=Confirm cancellation
 ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature
 Recruitment=Recruitment
+NoOpenJobOffer=No open job offers at the moment