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 21a4ef904..fa5a9375e 100644
--- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
+++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
@@ -473,9 +473,13 @@ import net.liftweb.util.Helpers._
         //AuthUser.currentUser.get.user.foreign // this will be issue when the resource user is in remote side {
         val user = AuthUser.currentUser.openOrThrowException(ErrorMessages.attemptedToOpenAnEmptyBox)
         // In case that the provider is empty field we default to "local_identity_provider" or "hostname"
-        val provider = if(user.provider.get.isEmpty) Constant.localIdentityProvider else user.provider.get
+        val provider = 
+          if(user.provider.get == null || user.provider.get.isEmpty) 
+            Constant.localIdentityProvider 
+          else 
+            user.provider.get
         Users.users.vend.getUserByUserName(provider, user.username.get)
-      }else if (directLogin.isDefined) // Direct Login
+      } else if (directLogin.isDefined) // Direct Login
         DirectLogin.getUser
       else if (hasDirectLoginHeader(authorization)) // Direct Login Deprecated
         DirectLogin.getUser