diff --git a/htdocs/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php
index 0591a1baddf..4ff7576e934 100644
--- a/htdocs/core/login/functions_openid.php
+++ b/htdocs/core/login/functions_openid.php
@@ -70,7 +70,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 			$sql = "SELECT login, entity, datestartvalidity, dateendvalidity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."user";
 			$sql .= " WHERE openid = '".$db->escape(GETPOST('openid_identity'))."'";
-			$sql .= " AND entity IN (0,".($_SESSION["dol_entity"] ? ((int) $_SESSION["dol_entity"]) : 1).")";
+			$sql .= " AND entity IN (0,".(!empty($_SESSION["dol_entity"]) ? ((int) $_SESSION["dol_entity"]) : 1).")";
 
 			dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
 			$resql = $db->query($sql);
diff --git a/htdocs/core/login/functions_openid_connect.php b/htdocs/core/login/functions_openid_connect.php
index f9a4483205e..0db79a506ea 100644
--- a/htdocs/core/login/functions_openid_connect.php
+++ b/htdocs/core/login/functions_openid_connect.php
@@ -19,6 +19,8 @@
  *      \file       htdocs/core/login/functions_openid_connect.php
  *      \ingroup    core
  *      \brief      OpenID Connect: Authorization Code flow authentication
+ *
+ *      See https://github.com/Dolibarr/dolibarr/issues/22740 for more information about setup openid_connect
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';