diff --git a/obp-api/src/main/scala/code/api/util/Glossary.scala b/obp-api/src/main/scala/code/api/util/Glossary.scala
index 323eb4584b..3ff011a8cf 100644
--- a/obp-api/src/main/scala/code/api/util/Glossary.scala
+++ b/obp-api/src/main/scala/code/api/util/Glossary.scala
@@ -3178,6 +3178,20 @@ object Glossary extends MdcLoggable  {
 		  |
 		  |""".stripMargin)
 
+		glossaryItems += GlossaryItem(
+			title = "QWAC",
+			description =
+				s"""A Qualified Website Authentication Certificate is a qualified digital certificate under the trust services defined in the European Union eIDAS Regulation.
+					 |A website authentication certificate makes it possible to establish a Transport Layer Security channel with the subject of the certificate, which secures data transferred through the channel.""".stripMargin)
+
+		glossaryItems += GlossaryItem(
+			title = "QSealC",
+			description =
+				s"""Qualified electronic Seal Certificate.
+					 |A certificate for electronic seals allows the relying party to validate the identity of the subject of the certificate,
+					 |as well as the authenticity and integrity of the sealed data, and also prove it to third parties.
+					 |The electronic seal provides strong evidence, capable of having legal effect, that given data is originated by the legal entity identified in the certificate.""".stripMargin)
+
 		glossaryItems += GlossaryItem(
 			title = "Cross-Device Authorization",
 			description =
diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
index 3b9d1de5c7..c5e3a8947c 100644
--- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
+++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
@@ -1576,7 +1576,12 @@ def restoreSomeSessions(): Unit = {
    * Please note that provider is implicitly defined i.e. not provided via a parameter
    */
   def findAuthUserByUsernameLocally(name: String): Box[TheUserType] = {
+    // 1st try is provider with local_identity_provider or hostname value
     find(By(this.username, name), By(this.provider, Constant.localIdentityProvider))
+      // 2nd try is provider with null value
+      .or(find(By(this.username, name), NullRef(this.provider)))
+      // 3rd try is provider with empty string value
+      .or(find(By(this.username, name), By(this.provider, "")))
   }
   def findAuthUserByPrimaryKey(key: Long): Box[TheUserType] = {
     find(By(this.user, key))