diff --git a/package-lock.json b/package-lock.json
index 0b367a5..92e42d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4054,7 +4054,7 @@
     "@farmmaps/common": {
       "version": "file:dist/common",
       "requires": {
-        "tslib": "^2.0.0"
+        "tslib": "^2.2.0"
       }
     },
     "@farmmaps/common-map": {
diff --git a/projects/common/src/fm/reducers/app-common.reducer.ts b/projects/common/src/fm/reducers/app-common.reducer.ts
index 33f8dde..600b900 100644
--- a/projects/common/src/fm/reducers/app-common.reducer.ts
+++ b/projects/common/src/fm/reducers/app-common.reducer.ts
@@ -58,13 +58,13 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
     case appCommonActions.INITUSERSUCCESS: {
       let a = action as appCommonActions.InitUserSuccess;
       let claims = {}
-      Object.getOwnPropertyNames(a.userinfo).forEach((k) => {
+      Object.getOwnPropertyNames(a.userinfo.info).forEach((k) => {
          claims[k] = a.userinfo[k];
       });
       var user:IUser = {
         code:a.user.code,
-        email:a.userinfo["email"],
-        name:a.userinfo["name"],
+        email:claims["email"]!== undefined ? claims["email"] : a.user.name,
+        name:claims["name"]!== undefined?claims["name"] : a.user.email,
         claims:claims,
         searchable: false
       };