diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala
index 1edfc754f..c8c28c90c 100644
--- a/obp-api/src/main/scala/code/api/util/APIUtil.scala
+++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala
@@ -2369,7 +2369,7 @@ Returns a string showed to the developer
       Future{(cc.user, Some(cc))}
     }
     else {
-      Future { (Empty, None) }
+      Future { (Empty, Some(cc)) }
     }
     
     
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 db55adefe..6d9324e89 100644
--- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
+++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
@@ -738,7 +738,7 @@ import net.liftweb.util.Helpers._
               // No need to store password, so store dummy string instead
               .password(generateUUID())
               .provider(iss)
-              .validated(emailVerified.getOrElse("false").toLowerCase() == "true")
+              .validated(emailVerified.exists(_.equalsIgnoreCase("true")))
               .saveMe()
         }
         Full(user)
diff --git a/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala b/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
index be397e2a8..9e832639b 100644
--- a/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
+++ b/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
@@ -447,6 +447,12 @@ class API2_2_0Test extends V220ServerSetup with DefaultUsers {
       val request = (v2_2Request / "message-docs" / "rest_vMar2019" )
       val response: APIResponse = makeGetRequest(request)
   
+      response.code should be (200)
+    }    
+    scenario("Get Message Docs - stored_procedure_vDec2019") {
+      val request = (v2_2Request / "message-docs" / "stored_procedure_vDec2019" )
+      val response: APIResponse = makeGetRequest(request)
+  
       response.code should be (200)
     }
   }