diff --git a/modules/auth/auth.controller.js b/modules/auth/auth.controller.js
index d6751dc..d32df49 100644
--- a/modules/auth/auth.controller.js
+++ b/modules/auth/auth.controller.js
@@ -367,7 +367,7 @@ async function getOrCreateUser(req, res, next) {
   //console.log(">>>>>>>>>>>>>>>>>>>>  getOrCreateUser", dataUser.userResult.user.Entity);
   //Refrescamos datos que nos interesan
   dataUser.id = dataUser.userResult.user.id;
-  dataUser.entityId = dataUser.userResult.user.Entity ? dataUser.userResult.user.Entity.id : null;
+  dataUser.entityId = dataUser.userResult.user.Entity ? dataUser.userResult.user.Entity.id : (dataUser.userResult.user.entityId? dataUser.userResult.user.entityId : null);
   dataUser.entityName = dataUser.userResult.user.Entity ? dataUser.userResult.user.Entity.name : "DEFAULT";
   dataUser.entityLevel = dataUser.userResult.user.Entity ? dataUser.userResult.user.Entity.level : null;