user identity handling fix fixed